diff options
author | Martin Panter <vadmium+py@gmail.com> | 2015-11-21 10:57:15 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-21 10:57:15 (GMT) |
commit | 36befa5b4c37b34de9c7f59eba26575b255114cf (patch) | |
tree | d87a8cd77c6bbdfeb0e15a8320740da4051ab786 /Modules/clinic | |
parent | 266b276f34db5cc106d100f63b631af1f1f8e0e2 (diff) | |
parent | e99e97762cc75ad94056275ddcae9c84d63a3412 (diff) | |
download | cpython-36befa5b4c37b34de9c7f59eba26575b255114cf.zip cpython-36befa5b4c37b34de9c7f59eba26575b255114cf.tar.gz cpython-36befa5b4c37b34de9c7f59eba26575b255114cf.tar.bz2 |
Issue #25626: Merge zlib fix from 3.5
Diffstat (limited to 'Modules/clinic')
-rw-r--r-- | Modules/clinic/zlibmodule.c.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h index 35661a5..c5cdf42 100644 --- a/Modules/clinic/zlibmodule.c.h +++ b/Modules/clinic/zlibmodule.c.h @@ -68,7 +68,7 @@ zlib_decompress(PyModuleDef *module, PyObject *args) unsigned int bufsize = DEF_BUF_SIZE; if (!PyArg_ParseTuple(args, "y*|iO&:decompress", - &data, &wbits, uint_converter, &bufsize)) + &data, &wbits, capped_uint_converter, &bufsize)) goto exit; return_value = zlib_decompress_impl(module, &data, wbits, bufsize); @@ -242,7 +242,7 @@ zlib_Decompress_decompress(compobject *self, PyObject *args) unsigned int max_length = 0; if (!PyArg_ParseTuple(args, "y*|O&:decompress", - &data, uint_converter, &max_length)) + &data, capped_uint_converter, &max_length)) goto exit; return_value = zlib_Decompress_decompress_impl(self, &data, max_length); @@ -353,7 +353,7 @@ zlib_Decompress_flush(compobject *self, PyObject *args) unsigned int length = DEF_BUF_SIZE; if (!PyArg_ParseTuple(args, "|O&:flush", - uint_converter, &length)) + capped_uint_converter, &length)) goto exit; return_value = zlib_Decompress_flush_impl(self, length); @@ -438,4 +438,4 @@ exit: #ifndef ZLIB_COMPRESS_COPY_METHODDEF #define ZLIB_COMPRESS_COPY_METHODDEF #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */ -/*[clinic end generated code: output=56ed1147bbbb4788 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7734aec079550bc8 input=a9049054013a1b77]*/ |