diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-04-09 00:26:44 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-04-09 00:26:44 (GMT) |
| commit | f62346775911d56b5440ec7fd699b749f5106436 (patch) | |
| tree | 376a3e64f1fc6496f3b5f812a56e92e85f51a513 /Modules | |
| parent | 45c2f778c4b4f4c5756d37014e0f39483e37d297 (diff) | |
| download | cpython-f62346775911d56b5440ec7fd699b749f5106436.zip cpython-f62346775911d56b5440ec7fd699b749f5106436.tar.gz cpython-f62346775911d56b5440ec7fd699b749f5106436.tar.bz2 | |
Merge r62235 from trunk.
Fix zlib crash from zlib.decompressobj().flush(val) when val was not positive.
It tried to allocate negative or zero memory. That fails.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/zlibmodule.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index 8cadcbc..aff165c 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -774,6 +774,10 @@ PyZlib_unflush(compobject *self, PyObject *args) if (!PyArg_ParseTuple(args, "|i:flush", &length)) return NULL; + if (length <= 0) { + PyErr_SetString(PyExc_ValueError, "length must be greater than zero"); + return NULL; + } if (!(retval = PyString_FromStringAndSize(NULL, length))) return NULL; |