summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-08-13 17:17:06 -0700
committerBenjamin Peterson <benjamin@python.org>2016-08-13 17:17:06 -0700
commitc69fbdd3cc17011cb0ba95c468351e7090ca41f4 (patch)
tree9c2f781086ed242aa9e8838574c02d6e1cf20982 /Modules
parent56ddcd8f7af28bdf3d33997ce52cfdc4243d85e3 (diff)
downloadcpython-c69fbdd3cc17011cb0ba95c468351e7090ca41f4.tar.gz
check for overflow in join_append_data (closes #27758)
Reported by Thomas E. Hybel
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_csv.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c
index f5f6e71686..dcb671e40a 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -1002,11 +1002,19 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
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 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
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