diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-11-18 22:27:00 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-11-18 22:27:00 (GMT) |
| commit | 83be3d268d0a109eff6bbdd9b453edcac6c6c33f (patch) | |
| tree | 0233350bde088b56b9de5214163b88b2531cb2f3 /Modules/imageop.c | |
| parent | 9adae2e7decfe738480e8cd0ec41bae95c053fc8 (diff) | |
| download | cpython-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 'Modules/imageop.c')
| -rw-r--r-- | Modules/imageop.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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) ) |