summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2011-05-14 22:20:52 (GMT)
committerNadeem Vawda <nadeem.vawda@gmail.com>2011-05-14 22:20:52 (GMT)
commit565d659dcd97af786a2422c36308f453958f4077 (patch)
tree0b9b82876151e2ec7983a20a735207f3690d00eb /Lib
parent95e686686f600e6df18c32a5e808949517655868 (diff)
parent0c3d96ae1dccc081fbc2a8c50ba6e41fbdc384de (diff)
downloadcpython-565d659dcd97af786a2422c36308f453958f4077.zip
cpython-565d659dcd97af786a2422c36308f453958f4077.tar.gz
cpython-565d659dcd97af786a2422c36308f453958f4077.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_zlib.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 48d9f58..930aac6 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -523,6 +523,17 @@ class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase):
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)."""