diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-18 00:47:36 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-18 00:47:36 (GMT) |
| commit | 9c74b14fe9b6dddc9d41dd37f431f174350004d4 (patch) | |
| tree | 3d30d794259f55f5021f5e8036447523d0e1eea3 /Modules/_csv.c | |
| parent | 036aa5433e963f6576c5dfa02ace4ca0e2c642a2 (diff) | |
| download | cpython-9c74b14fe9b6dddc9d41dd37f431f174350004d4.zip cpython-9c74b14fe9b6dddc9d41dd37f431f174350004d4.tar.gz cpython-9c74b14fe9b6dddc9d41dd37f431f174350004d4.tar.bz2 | |
Merged revisions 64114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64114 | gregory.p.smith | 2008-06-11 09:41:16 +0200 (mer., 11 juin 2008) | 6 lines
Merge in release25-maint r60793:
Added checks for integer overflows, contributed by Google. Some are
only available if asserts are left in the code, in cases where they
can't be triggered from Python code.
........
Diffstat (limited to 'Modules/_csv.c')
| -rw-r--r-- | Modules/_csv.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index c654712..430ccdc 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -533,6 +533,10 @@ parse_grow_buff(ReaderObj *self) self->field = PyMem_New(Py_UNICODE, self->field_size); } else { + if (self->field_size > INT_MAX / 2) { + PyErr_NoMemory(); + return 0; + } self->field_size *= 2; self->field = PyMem_Resize(self->field, Py_UNICODE, self->field_size); @@ -1038,6 +1042,12 @@ join_append_data(WriterObj *self, Py_UNICODE *field, int quote_empty, static int join_check_rec_size(WriterObj *self, int rec_len) { + + if (rec_len < 0 || rec_len > INT_MAX - MEM_INCR) { + PyErr_NoMemory(); + return 0; + } + if (rec_len > self->rec_size) { if (self->rec_size == 0) { self->rec_size = (rec_len / MEM_INCR + 1) * MEM_INCR; |