From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 14 Aug 2016 00:17:06 +0000 (-0700)
Subject: check for overflow in join_append_data (closes #27758)
X-Git-Tag: v2.7.13rc1~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d81ad0df717d21867c676f8dee454a9df2f6aece;p=python

check for overflow in join_append_data (closes #27758)

Reported by Thomas E. Hybel
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 9cb550ad08..c25d682842 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #27758: Fix possible integer overflow in the _csv module for large record
+  lengths.
+
 - Issue #23369: Fixed possible integer overflow in
   _json.encode_basestring_ascii.
 
diff --git a/Modules/_csv.c b/Modules/_csv.c
index af4665897a..4589f06dec 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -985,11 +985,19 @@ join_append_data(WriterObj *self, char *field, int quote_empty,
     int i, rec_len;
     char *lineterm;
 
-#define ADDCH(c) \
+#define INCLEN \
+    do {\
+        if (!copy_phase && rec_len == INT_MAX) { \
+            goto overflow; \
+        } \
+        rec_len++; \
+    } while(0)
+
+#define ADDCH(c)                                \
     do {\
         if (copy_phase) \
             self->rec[rec_len] = c;\
-        rec_len++;\
+        INCLEN;\
     } while(0)
 
     lineterm = PyString_AsString(dialect->lineterminator);
@@ -1059,11 +1067,18 @@ join_append_data(WriterObj *self, char *field, int quote_empty,
     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