[2.7] bpo-38730: Fix -Wstringop-truncation warnings. (GH-17075)

benjaminp · web-flow · commit f32bcf8c27f3 · 2019-11-07T07:06:28.000-08:00
diff --git a/Misc/NEWS.d/next/Build/2019-11-06-20-53-54.bpo-38730.UQsW_r.rst b/Misc/NEWS.d/next/Build/2019-11-06-20-53-54.bpo-38730.UQsW_r.rst
@@ -0,0 +1 @@
+Fix problems identified by GCC's ``-Wstringop-truncation`` warning.
diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -486,7 +486,7 @@ calculate_path(void)
             if (tmpbuffer[0] == SEP)
                 /* tmpbuffer should never be longer than MAXPATHLEN,
                    but extra check does not hurt */
-                strncpy(argv0_path, tmpbuffer, MAXPATHLEN);
+                strncpy(argv0_path, tmpbuffer, MAXPATHLEN + 1);
             else {
                 /* Interpret relative to progpath */
                 reduce(argv0_path);
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
@@ -1055,14 +1055,15 @@ validate_numnodes(node *n, int num, const char *const name)
 static int
 validate_terminal(node *terminal, int type, char *string)
 {
-    int res = (validate_ntype(terminal, type)
-               && ((string == 0) || (strcmp(string, STR(terminal)) == 0)));
-
-    if (!res && !PyErr_Occurred()) {
+    if (!validate_ntype(terminal, type)) {
+        return 0;
+    }
+    if (string != NULL && strcmp(string, STR(terminal)) != 0) {
         PyErr_Format(parser_error,
                      "Illegal terminal: expected \"%s\"", string);
+        return 0;
     }
-    return (res);
+    return 1;
 }
 
 
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -1180,7 +1180,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
     q = p;
     p = PyMem_Malloc(n+2);
     if (p != NULL) {
-        strncpy(p, q, n);
+        memcpy(p, q, n);
         p[n] = '\n';
         p[n+1] = '\0';
     }
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -173,8 +173,10 @@ trip_signal(int sig_num)
        cleared in PyErr_CheckSignals() before .tripped. */
     is_tripped = 1;
     Py_AddPendingCall(checksignals_witharg, NULL);
-    if (wakeup_fd != -1)
-        write(wakeup_fd, "\0", 1);
+    if (wakeup_fd != -1) {
+        int rc = write(wakeup_fd, "\0", 1);
+        (void)rc;
+    }
 }
 
 static void
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -714,8 +714,8 @@ read_directory(const char *archive)
     unsigned int count, i;
     unsigned char buffer[46];
     size_t length;
-    char path[MAXPATHLEN + 5];
-    char name[MAXPATHLEN + 5];
+    char name[MAXPATHLEN + 1];
+    char path[2*MAXPATHLEN + 2]; /* archive + SEP + name + '\0' */
     const char *errmsg = NULL;
 
     if (strlen(archive) > MAXPATHLEN) {
@@ -838,7 +838,7 @@ read_directory(const char *archive)
             }
         }
 
-        strncpy(path + length + 1, name, MAXPATHLEN - length - 1);
+        memcpy(path + length + 1, name, name_size + 1);
 
         t = Py_BuildValue("sHIIkHHI", path, compress, data_size,
                           file_size, file_offset, time, date, crc);
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -252,10 +252,7 @@ structseq_repr(PyStructSequence *obj)
     }
 
     /* "typename(", limited to  TYPE_MAXSIZE */
-    len = strlen(typ->tp_name) > TYPE_MAXSIZE ? TYPE_MAXSIZE :
-                            strlen(typ->tp_name);
-    strncpy(pbuf, typ->tp_name, len);
-    pbuf += len;
+    pbuf = stpncpy(pbuf, typ->tp_name, TYPE_MAXSIZE);
     *pbuf++ = '(';
 
     for (i=0; i < VISIBLE_SIZE(obj); i++) {
diff --git a/Python/compile.c b/Python/compile.c
@@ -221,7 +221,7 @@ _Py_Mangle(PyObject *privateobj, PyObject *ident)
     }
     plen = strlen(p);
 
-    if (plen + nlen >= PY_SSIZE_T_MAX - 1) {
+    if (nlen >= PY_SSIZE_T_MAX - 1 - plen) {
         PyErr_SetString(PyExc_OverflowError,
                         "private identifier too large to be mangled");
         return NULL;
@@ -233,7 +233,7 @@ _Py_Mangle(PyObject *privateobj, PyObject *ident)
     /* ident = "_" + p[:plen] + name # i.e. 1+plen+nlen bytes */
     buffer = PyString_AS_STRING(ident);
     buffer[0] = '_';
-    strncpy(buffer+1, p, plen);
+    memcpy(buffer+1, p, plen);
     strcpy(buffer+1+plen, name);
     return ident;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix problems identified by GCC's ``-Wstringop-truncation`` warning.
Original file line number	Diff line number	Diff line change
`@@ -1055,14 +1055,15 @@ validate_numnodes(node n, int num, const char const name)`
`1055`	`1055`	`static int`
`1056`	`1056`	`validate_terminal(node terminal, int type, char string)`
`1057`	`1057`	`{`
`1058`		`- int res = (validate_ntype(terminal, type)`
`1059`		`- && ((string == 0) \|\| (strcmp(string, STR(terminal)) == 0)));`
`1060`		`-`
`1061`		`- if (!res && !PyErr_Occurred()) {`
	`1058`	`+ if (!validate_ntype(terminal, type)) {`
	`1059`	`+ return 0;`
	`1060`	`+ }`
	`1061`	`+ if (string != NULL && strcmp(string, STR(terminal)) != 0) {`
`1062`	`1062`	`PyErr_Format(parser_error,`
`1063`	`1063`	`"Illegal terminal: expected \"%s\"", string);`
	`1064`	`+ return 0;`
`1064`	`1065`	`}`
`1065`		`- return (res);`
	`1066`	`+ return 1;`
`1066`	`1067`	`}`
`1067`	`1068`
`1068`	`1069`
Original file line number	Diff line number	Diff line change
`@@ -1180,7 +1180,7 @@ call_readline(FILE sys_stdin, FILE sys_stdout, char *prompt)`
`1180`	`1180`	`q = p;`
`1181`	`1181`	`p = PyMem_Malloc(n+2);`
`1182`	`1182`	`if (p != NULL) {`
`1183`		`- strncpy(p, q, n);`
	`1183`	`+ memcpy(p, q, n);`
`1184`	`1184`	`p[n] = '\n';`
`1185`	`1185`	`p[n+1] = '\0';`
`1186`	`1186`	`}`