diff options
| -rw-r--r-- | Lib/test/test_zlib.py | 5 | ||||
| -rw-r--r-- | Modules/zlibmodule.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index 0c96842..adb87ff 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -83,6 +83,11 @@ class ExceptionTestCase(unittest.TestCase): # verify failure on building decompress object with bad params self.assertRaises(ValueError, zlib.decompressobj, 0) + def test_decompressobj_badflush(self): + # verify failure on calling decompressobj.flush with bad params + self.assertRaises(ValueError, zlib.decompressobj().flush, 0) + self.assertRaises(ValueError, zlib.decompressobj().flush, -1) + class CompressTestCase(unittest.TestCase): diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index f59343f..4f78dbc 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; |