commit c04ddff290fc203d05b75c8569b748525fb76b5b
author Mark Dickinson <mdickinson@enthought.com> Sat Oct 06 18:04:49 2012 +0100
committer Mark Dickinson <mdickinson@enthought.com> Sat Oct 06 18:04:49 2012 +0100
tree 184849e76ebe965016c2737939f9eaa0dfb900ee
parent a2028733ef072740921017e544d29d191fdb2c9c

Issue #16096: Fix several occurrences of potential signed integer overflow.  Thanks Serhiy Storchaka.

Modules/_codecsmodule.c

diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 7818f9a..40037b1 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -177,12 +177,12 @@
         return NULL;
 
     size = PyBytes_GET_SIZE(str);
-    newsize = 4*size;
-    if (newsize > PY_SSIZE_T_MAX || newsize / 4 != size) {
+    if (size > PY_SSIZE_T_MAX / 4) {
         PyErr_SetString(PyExc_OverflowError,
             "string is too large to encode");
             return NULL;
     }
+    newsize = 4*size;
     v = PyBytes_FromStringAndSize(NULL, newsize);
 
     if (v == NULL) {