check for overflow in join_append_data (closes #27758)

Reported by Thomas E. Hybel
This commit is contained in:
Benjamin Peterson 2016-08-13 17:17:06 -07:00
parent 6f25003291
commit 6e01d90cc8
2 changed files with 22 additions and 4 deletions

View File

@ -29,6 +29,9 @@ Core and Builtins
Library Library
------- -------
- Issue #27758: Fix possible integer overflow in the _csv module for large record
lengths.
- Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the - Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the
HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates
that the script is in CGI mode. that the script is in CGI mode.

View File

@ -1002,11 +1002,19 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
int i; int i;
Py_ssize_t rec_len; 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 {\ do {\
if (copy_phase) \ if (copy_phase) \
self->rec[rec_len] = c;\ self->rec[rec_len] = c;\
rec_len++;\ INCLEN;\
} while(0) } while(0)
rec_len = self->rec_len; rec_len = self->rec_len;
@ -1072,11 +1080,18 @@ join_append_data(WriterObj *self, unsigned int field_kind, void *field_data,
if (*quoted) { if (*quoted) {
if (copy_phase) if (copy_phase)
ADDCH(dialect->quotechar); ADDCH(dialect->quotechar);
else else {
rec_len += 2; INCLEN; /* starting quote */
INCLEN; /* ending quote */
}
} }
return rec_len; return rec_len;
overflow:
PyErr_NoMemory();
return -1;
#undef ADDCH #undef ADDCH
#undef INCLEN
} }
static int static int