Issue #29145: Merge 3.6.

zhangyangyu · zhangyangyu · commit 7a4da324dc44 · 2017-01-10T10:56:38.000+08:00
diff --git a/Objects/stringlib/transmogrify.h b/Objects/stringlib/transmogrify.h
@@ -261,7 +261,7 @@ stringlib_replace_interleave(PyObject *self,
     assert(count > 0);
     if (to_len > (PY_SSIZE_T_MAX - self_len) / count) {
         PyErr_SetString(PyExc_OverflowError,
-                        "replace bytes are too long");
+                        "replace bytes is too long");
         return NULL;
     }
     result_len = count * to_len + self_len;
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -9950,7 +9950,7 @@ _PyUnicode_JoinArray(PyObject *separator, PyObject **items, Py_ssize_t seqlen)
     use_memcpy = 1;
 #endif
     for (i = 0; i < seqlen; i++) {
-        const Py_ssize_t old_sz = sz;
+        size_t add_sz;
         item = items[i];
         if (!PyUnicode_Check(item)) {
             PyErr_Format(PyExc_TypeError,
@@ -9961,16 +9961,18 @@ _PyUnicode_JoinArray(PyObject *separator, PyObject **items, Py_ssize_t seqlen)
         }
         if (PyUnicode_READY(item) == -1)
             goto onError;
-        sz += PyUnicode_GET_LENGTH(item);
+        add_sz = PyUnicode_GET_LENGTH(item);
         item_maxchar = PyUnicode_MAX_CHAR_VALUE(item);
         maxchar = Py_MAX(maxchar, item_maxchar);
-        if (i != 0)
-            sz += seplen;
-        if (sz < old_sz || sz > PY_SSIZE_T_MAX) {
+        if (i != 0) {
+            add_sz += seplen;
+        }
+        if (add_sz > (size_t)(PY_SSIZE_T_MAX - sz)) {
             PyErr_SetString(PyExc_OverflowError,
                             "join() result is too long for a Python string");
             goto onError;
         }
+        sz += add_sz;
         if (use_memcpy && last_obj != NULL) {
             if (PyUnicode_KIND(last_obj) != PyUnicode_KIND(item))
                 use_memcpy = 0;
@@ -10608,7 +10610,7 @@ replace(PyObject *self, PyObject *str1,
             u = unicode_empty;
             goto done;
         }
-        if (new_size > (PY_SSIZE_T_MAX >> (rkind-1))) {
+        if (new_size > (PY_SSIZE_T_MAX / rkind)) {
             PyErr_SetString(PyExc_OverflowError,
                             "replace string is too long");
             goto error;

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ stringlib_replace_interleave(PyObject *self,`
`261`	`261`	`assert(count > 0);`
`262`	`262`	`if (to_len > (PY_SSIZE_T_MAX - self_len) / count) {`
`263`	`263`	`PyErr_SetString(PyExc_OverflowError,`
`264`		`- "replace bytes are too long");`
	`264`	`+ "replace bytes is too long");`
`265`	`265`	`return NULL;`
`266`	`266`	`}`
`267`	`267`	`result_len = count * to_len + self_len;`