changeset:   102640:609b554dd4a2
parent:      102634:dda25c37d02b
parent:      102639:55e8d3e542bd
user:        Benjamin Peterson <benjamin@python.org>
date:        Sat Aug 13 17:22:18 2016 -0700
files:       Misc/NEWS Modules/_csv.c
description:
merge 3.5 (closes #27758)


diff -r dda25c37d02b -r 609b554dd4a2 Misc/NEWS
--- a/Misc/NEWS	Sat Aug 13 14:47:54 2016 -0400
+++ b/Misc/NEWS	Sat Aug 13 17:22:18 2016 -0700
@@ -58,6 +58,9 @@
 
 - Issue #27661: Added tzinfo keyword argument to datetime.combine.
 
+- Issue #27758: Fix possible integer overflow in the _csv module for large record
+  lengths.
+
 - Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the
   HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates
   that the script is in CGI mode.
diff -r dda25c37d02b -r 609b554dd4a2 Modules/_csv.c
--- a/Modules/_csv.c	Sat Aug 13 14:47:54 2016 -0400
+++ b/Modules/_csv.c	Sat Aug 13 17:22:18 2016 -0700
@@ -1014,11 +1014,19 @@
     int i;
     Py_ssize_t rec_len;
 
-#define ADDCH(c) \
+#define INCLEN \
+    do {\
+        if (!copy_phase && rec_len == PY_SSIZE_T_MAX) {    \
+            goto overflow; \
+        } \
+        rec_len++; \
+    } while(0)
+
+#define ADDCH(c)                                \
     do {\
         if (copy_phase) \
             self->rec[rec_len] = c;\
-        rec_len++;\
+        INCLEN;\
     } while(0)
 
     rec_len = self->rec_len;
@@ -1072,11 +1080,18 @@
     if (*quoted) {
         if (copy_phase)
             ADDCH(dialect->quotechar);
-        else
-            rec_len += 2;
+        else {
+            INCLEN; /* starting quote */
+            INCLEN; /* ending quote */
+        }
     }
     return rec_len;
+
+  overflow:
+    PyErr_NoMemory();
+    return -1;
 #undef ADDCH
+#undef INCLEN
 }
 
 static int