changeset: 70120:f86a22b6ab58
parent: 70117:7fb34d30bd59
parent: 70119:3ff862d05d18
user: Nadeem Vawda <nadeem.vawda@gmail.com>
date: Sun May 15 00:23:40 2011 +0200
files: Misc/NEWS Modules/zlibmodule.c
description:
Merge: #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result.
diff -r 7fb34d30bd59 -r f86a22b6ab58 Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py	Sat May 14 17:51:10 2011 -0400
+++ b/Lib/test/test_zlib.py	Sun May 15 00:23:40 2011 +0200
@@ -523,6 +523,17 @@
 decompress = lambda s: d.decompress(s) + d.flush()
 self.check_big_decompress_buffer(size, decompress)
 
+ @precisionbigmemtest(size=_4G + 100, memuse=1)
+ def test_length_overflow(self, size):
+ if size < _4G + 100: + self.skipTest("not enough free memory, need at least 4 GB") + data = b'x' * size + try: + self.assertRaises(OverflowError, zlib.compress, data, 1) + self.assertRaises(OverflowError, zlib.decompress, data) + finally: + data = None + def genblock(seed, length, step=1024, generator=random): """length-byte stream of random data from a seed (in step-byte blocks).""" diff -r 7fb34d30bd59 -r f86a22b6ab58 Misc/NEWS --- a/Misc/NEWS Sat May 14 17:51:10 2011 -0400 +++ b/Misc/NEWS Sun May 15 00:23:40 2011 +0200 @@ -147,6 +147,11 @@ Library ------- +- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and + their incremental counterparts now raise OverflowError if given an input + larger than 4GB, instead of silently truncating the input and returning + an incorrect result. + - Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail attribute when called without a max_length argument. diff -r 7fb34d30bd59 -r f86a22b6ab58 Modules/zlibmodule.c --- a/Modules/zlibmodule.c Sat May 14 17:51:10 2011 -0400 +++ b/Modules/zlibmodule.c Sun May 15 00:23:40 2011 +0200 @@ -420,22 +420,26 @@ static PyObject * PyZlib_objcompress(compobject *self, PyObject *args) { - int err, inplen; + int err; + unsigned int inplen; Py_ssize_t length = DEFAULTALLOC; - PyObject *RetVal; + PyObject *RetVal = NULL; Py_buffer pinput; Byte *input; unsigned long start_total_out; if (!PyArg_ParseTuple(args, "y*:compress", &pinput)) return NULL; + if (pinput.len> UINT_MAX) {
+ PyErr_SetString(PyExc_OverflowError,
+ "Size does not fit in an unsigned int");
+ goto error_outer;
+ }
 input = pinput.buf;
 inplen = pinput.len;
 
- if (!(RetVal = PyBytes_FromStringAndSize(NULL, length))) {
- PyBuffer_Release(&pinput);
- return NULL;
- }
+ if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
+ goto error_outer;
 
 ENTER_ZLIB(self);
 
@@ -484,6 +488,7 @@
 
 error:
 LEAVE_ZLIB(self);
+ error_outer:
 PyBuffer_Release(&pinput);
 return RetVal;
 }
@@ -502,9 +507,10 @@
 static PyObject *
 PyZlib_objdecompress(compobject *self, PyObject *args)
 {
- int err, inplen, max_length = 0;
+ int err, max_length = 0;
+ unsigned int inplen;
 Py_ssize_t old_length, length = DEFAULTALLOC;
- PyObject *RetVal;
+ PyObject *RetVal = NULL;
 Py_buffer pinput;
 Byte *input;
 unsigned long start_total_out;
@@ -512,22 +518,24 @@
 if (!PyArg_ParseTuple(args, "y*&#124;i:decompress", &pinput,
 &max_length))
 return NULL;
+ if (pinput.len> UINT_MAX) {
+ PyErr_SetString(PyExc_OverflowError,
+ "Size does not fit in an unsigned int");
+ goto error_outer;
+ }
 input = pinput.buf;
 inplen = pinput.len;
 if (max_length < 0) { - PyBuffer_Release(&pinput); PyErr_SetString(PyExc_ValueError, "max_length must be greater than zero"); - return NULL; + goto error_outer; } /* limit amount of data allocated to max_length */ if (max_length && length> max_length)
 length = max_length;
- if (!(RetVal = PyBytes_FromStringAndSize(NULL, length))) {
- PyBuffer_Release(&pinput);
- return NULL;
- }
+ if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
+ goto error_outer;
 
 ENTER_ZLIB(self);
 
@@ -621,6 +629,7 @@
 
 error:
 LEAVE_ZLIB(self);
+ error_outer:
 PyBuffer_Release(&pinput);
 return RetVal;
 }
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/f86a22b6ab58">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/f86a22b6ab58" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>