summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-11-18 22:27:00 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-11-18 22:27:00 (GMT)
commit83be3d268d0a109eff6bbdd9b453edcac6c6c33f (patch)
tree0233350bde088b56b9de5214163b88b2531cb2f3 /Lib/test
parent9adae2e7decfe738480e8cd0ec41bae95c053fc8 (diff)
downloadcpython-83be3d268d0a109eff6bbdd9b453edcac6c6c33f.zip
cpython-83be3d268d0a109eff6bbdd9b453edcac6c6c33f.tar.gz
cpython-83be3d268d0a109eff6bbdd9b453edcac6c6c33f.tar.bz2
Merged revisions 67266 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67266 | amaury.forgeotdarc | 2008-11-18 23:19:37 +0100 (mar., 18 nov. 2008) | 4 lines #4317: Fix an Array Bounds Read in imageop.rgb2rgb8. Will backport to 2.4. ........
Diffstat (limited to 'Lib/test')
-rwxr-xr-xLib/test/test_imageop.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py
index 6deaa34..9063b22 100755
--- a/Lib/test/test_imageop.py
+++ b/Lib/test/test_imageop.py
@@ -15,6 +15,7 @@ SIZES = (1, 2, 3, 4)
_VALUES = (1, 2, 2**10, 2**15-1, 2**15, 2**15+1, 2**31-2, 2**31-1)
VALUES = tuple( -x for x in reversed(_VALUES) ) + (0,) + _VALUES
AAAAA = "A" * 1024
+MAX_LEN = 2**20
class InputValidationTests(unittest.TestCase):
@@ -26,7 +27,7 @@ class InputValidationTests(unittest.TestCase):
strlen = abs(width * height)
if size:
strlen *= size
- if strlen < 1024:
+ if strlen < MAX_LEN:
data = "A" * strlen
else:
data = AAAAA