[Python-checkins] cpython (2.7): check for overflow in join_append_data (closes #27758)
benjamin.peterson
python-checkins at python.org
Sat Aug 13 20:22:37 EDT 2016
https://hg.python.org/cpython/rev/fdae903db33a
changeset: 102636:fdae903db33a
branch: 2.7
user: Benjamin Peterson <benjamin at python.org>
date: Sat Aug 13 17:17:06 2016 -0700
summary:
check for overflow in join_append_data (closes #27758)
Reported by Thomas E. Hybel
files:
Misc/NEWS | 3 +++
Modules/_csv.c | 23 +++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@
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
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -985,11 +985,19 @@
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 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list