[Python-checkins] r59080 - in python/branches/release25-maint: Misc/NEWS Modules/zlibmodule.c

[christian.heimes]

Author: christian.heimes
Date: Wed Nov 21 01:44:57 2007
New Revision: 59080

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/zlibmodule.c
Log:
Fixed #1372: zlibmodule.c: int overflow in PyZlib_decompress

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Wed Nov 21 01:44:57 2007
@@ -141,6 +141,8 @@
 
 - Build using system ffi library on arm*-linux*.
 
+- Bug #1372: zlibmodule.c: int overflow in PyZlib_decompress
+
 
 Documentation
 -------------

Modified: python/branches/release25-maint/Modules/zlibmodule.c
==============================================================================
--- python/branches/release25-maint/Modules/zlibmodule.c	(original)
+++ python/branches/release25-maint/Modules/zlibmodule.c	Wed Nov 21 01:44:57 2007
@@ -197,10 +197,11 @@
     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;