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.
........
diff --git a/Modules/imageop.c b/Modules/imageop.c
index 61a0c2f..8d0d68f 100644
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -590,7 +590,7 @@
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) )