#4317: Fix an Array Bounds Read in imageop.rgb2rgb8.
Backport of r67266
This commit is contained in:
parent
42fe1a2ff8
commit
ef633d7c5d
|
@ -19,6 +19,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):
|
||||
|
@ -30,7 +31,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
|
||||
|
|
|
@ -12,6 +12,8 @@ What's New in Python 2.5.3?
|
|||
Core and builtins
|
||||
-----------------
|
||||
|
||||
- Issue #4317: Fixed a crash in the imageop.rgb2rgb8() function.
|
||||
|
||||
- Issue #4230: If ``__getattr__`` is a descriptor, it now functions correctly.
|
||||
|
||||
- Issue #4048: The parser module now correctly validates relative imports.
|
||||
|
|
|
@ -590,7 +590,7 @@ imageop_rgb2rgb8(PyObject *self, PyObject *args)
|
|||
if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
|
||||
return 0;
|
||||
|
||||
if ( !check_multiply_size(len*4, x, "x", y, "y", 4) )
|
||||
if ( !check_multiply_size(len, x, "x", y, "y", 4) )
|
||||
return 0;
|
||||
nlen = x*y;
|
||||
if ( !check_multiply(nlen, x, y) )
|
||||
|
|
Loading…
Reference in New Issue