changeset:   102647:9822bf4bcece
branch:      3.4
parent:      102642:d5f6bc45b376
parent:      102646:54c74212db91
user:        Benjamin Peterson <benjamin@python.org>
date:        Sat Aug 13 18:36:55 2016 -0700
files:       Misc/NEWS Modules/binascii.c
description:
merge 3.3 (closes #27760)


diff -r d5f6bc45b376 -r 9822bf4bcece Misc/NEWS
--- a/Misc/NEWS	Sat Aug 13 18:15:28 2016 -0700
+++ b/Misc/NEWS	Sat Aug 13 18:36:55 2016 -0700
@@ -16,6 +16,8 @@
 - In the curses module, raise an error if window.getstr() is passed a negative
   value.
 
+- Issue #27760: Fix possible integer overflow in binascii.b2a_qp.
+
 - Issue #27758: Fix possible integer overflow in the _csv module for large record
   lengths.
 
diff -r d5f6bc45b376 -r 9822bf4bcece Modules/binascii.c
--- a/Modules/binascii.c	Sat Aug 13 18:15:28 2016 -0700
+++ b/Modules/binascii.c	Sat Aug 13 18:36:55 2016 -0700
@@ -1408,6 +1408,7 @@
     /* First, scan to see how many characters need to be encoded */
     in = 0;
     while (in < datalen) {
+        Py_ssize_t delta = 0;
         if ((databuf[in] > 126) ||
             (databuf[in] == '=') ||
             (header && databuf[in] == '_') ||
@@ -1422,12 +1423,12 @@
             if ((linelen + 3) >= MAXLINESIZE) {
                 linelen = 0;
                 if (crlf)
-                    odatalen += 3;
+                    delta += 3;
                 else
-                    odatalen += 2;
+                    delta += 2;
             }
             linelen += 3;
-            odatalen += 3;
+            delta += 3;
             in++;
         }
         else {
@@ -1439,11 +1440,11 @@
                 linelen = 0;
                 /* Protect against whitespace on end of line */
                 if (in && ((databuf[in-1] == ' ') || (databuf[in-1] == '\t')))
-                    odatalen += 2;
+                    delta += 2;
                 if (crlf)
-                    odatalen += 2;
+                    delta += 2;
                 else
-                    odatalen += 1;
+                    delta += 1;
                 if (databuf[in] == '\r')
                     in += 2;
                 else
@@ -1455,15 +1456,20 @@
                     (linelen + 1) >= MAXLINESIZE) {
                     linelen = 0;
                     if (crlf)
-                        odatalen += 3;
+                        delta += 3;
                     else
-                        odatalen += 2;
+                        delta += 2;
                 }
                 linelen++;
-                odatalen++;
+                delta++;
                 in++;
             }
         }
+        if (PY_SSIZE_T_MAX - delta < odatalen) {
+            PyErr_NoMemory();
+            return NULL;
+        }
+        odatalen += delta;
     }
 
     /* We allocate the output same size as input, this is overkill.