From: Christian Heimes <christian@cheimes.de>
Date: Wed, 21 Nov 2007 00:44:57 +0000 (+0000)
Subject: Fixed #1372: zlibmodule.c: int overflow in PyZlib_decompress
X-Git-Tag: v2.5.2c1~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=946a51c187827adad860c6bb1986268ae68635d0;p=thirdparty%2FPython%2Fcpython.git

Fixed #1372: zlibmodule.c: int overflow in PyZlib_decompress
---

diff --git a/Misc/NEWS b/Misc/NEWS
index ab86a14d9344..28c6c2a96a7a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -141,6 +141,8 @@ Extension Modules
 
 - Build using system ffi library on arm*-linux*.
 
+- Bug #1372: zlibmodule.c: int overflow in PyZlib_decompress
+
 
 Documentation
 -------------
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index da31e8b2827d..8cadcbc52cbd 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -197,10 +197,11 @@ PyZlib_decompress(PyObject *self, PyObject *args)
     PyObject *result_str;
     Byte *input;
     int length, err;
-    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
+    int wsize=DEF_WBITS;
+    Py_ssize_t r_strlen=DEFAULTALLOC;
     z_stream zst;
 
-    if (!PyArg_ParseTuple(args, "s#|ii:decompress",
+    if (!PyArg_ParseTuple(args, "s#|in:decompress",
 			  &input, &length, &wsize, &r_strlen))
 	return NULL;