summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2012-11-11 02:16:44 (GMT)
committerNadeem Vawda <nadeem.vawda@gmail.com>2012-11-11 02:16:44 (GMT)
commitec6dfcffa05414e7ee29cfe88551a3d3dcdaafdc (patch)
tree084a9ec3b07d4b337ddac4535324f3e8c117264d /Modules
parentdd1253abdd8564b095f24107547be0b8ce91e653 (diff)
parent7ee955550b27af117ddca61deb061e13423cf24b (diff)
downloadcpython-ec6dfcffa05414e7ee29cfe88551a3d3dcdaafdc.zip
cpython-ec6dfcffa05414e7ee29cfe88551a3d3dcdaafdc.tar.gz
cpython-ec6dfcffa05414e7ee29cfe88551a3d3dcdaafdc.tar.bz2
Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/zlibmodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 9fabb00..5a57fe9 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -975,6 +975,8 @@ PyZlib_unflush(compobject *self, PyObject *args)
ENTER_ZLIB(self);
start_total_out = self->zst.total_out;
+ self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
+ self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
self->zst.avail_out = length;
self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);