diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-12-01 01:46:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 01:46:40 (GMT) |
| commit | 989052047eea7f35da0d7ca268791b2442ee1553 (patch) | |
| tree | 6ec7ed8a81dfeac902e36e0677185a465df3107b /Objects | |
| parent | 503ce5c482cb267b0770bc46c315d5cf822bdca9 (diff) | |
| download | cpython-989052047eea7f35da0d7ca268791b2442ee1553.zip cpython-989052047eea7f35da0d7ca268791b2442ee1553.tar.gz cpython-989052047eea7f35da0d7ca268791b2442ee1553.tar.bz2 | |
Fix compiler warning in structseq_repr() (GH-10841)
Replace strncpy() with memcpy() in structseq_repr() to fix the
following compiler warning:
Objects/structseq.c:187:5: warning: 'strncpy' specified bound depends on the length of the source argument [-Wstringop-overflow=]
strncpy(pbuf, typ->tp_name, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Objects/structseq.c:185:11: note: length computed here
len = strlen(typ->tp_name) > TYPE_MAXSIZE ? TYPE_MAXSIZE :
The function writes the terminating NUL byte later.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/structseq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/structseq.c b/Objects/structseq.c index 05ea87b..cf94155 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -182,9 +182,9 @@ structseq_repr(PyStructSequence *obj) endofbuf= &buf[REPR_BUFFER_SIZE-5]; /* "typename(", limited to TYPE_MAXSIZE */ - len = strlen(typ->tp_name) > TYPE_MAXSIZE ? TYPE_MAXSIZE : - strlen(typ->tp_name); - strncpy(pbuf, typ->tp_name, len); + len = strlen(typ->tp_name); + len = Py_MIN(len, TYPE_MAXSIZE); + memcpy(pbuf, typ->tp_name, len); pbuf += len; *pbuf++ = '('; |