|
 |
59062c0 |
diff -ru Python-2.5-orig/Modules/imageop.c Python-2.5/Modules/imageop.c
|
|
|
59062c0 |
--- Python-2.5-orig/Modules/imageop.c 2006-01-19 01:09:39.000000000 -0500
|
|
|
59062c0 |
+++ Python-2.5/Modules/imageop.c 2007-10-19 01:11:33.000000000 -0400
|
|
|
59062c0 |
@@ -78,7 +78,7 @@
|
|
|
59062c0 |
char *cp, *ncp;
|
|
|
59062c0 |
short *nsp;
|
|
|
59062c0 |
Py_Int32 *nlp;
|
|
|
59062c0 |
- int len, size, x, y, newx1, newx2, newy1, newy2;
|
|
|
59062c0 |
+ int len, size, x, y, newx1, newx2, newy1, newy2, nlen;
|
|
|
59062c0 |
int ix, iy, xstep, ystep;
|
|
|
59062c0 |
PyObject *rv;
|
|
|
59062c0 |
|
|
|
59062c0 |
@@ -90,13 +90,19 @@
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "Size should be 1, 2 or 4");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
- if ( len != size*x*y ) {
|
|
|
59062c0 |
+ if (( len != size*x*y ) ||
|
|
|
59062c0 |
+ ( size != ((len / x) / y) )) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
xstep = (newx1 < newx2)? 1 : -1;
|
|
|
59062c0 |
ystep = (newy1 < newy2)? 1 : -1;
|
|
|
59062c0 |
|
|
|
59062c0 |
+ nlen = (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size;
|
|
|
59062c0 |
+ if ( size != ((nlen / (abs(newx2-newx1)+1)) / (abs(newy2-newy1)+1)) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
rv = PyString_FromStringAndSize(NULL,
|
|
|
59062c0 |
(abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size);
|
|
|
59062c0 |
if ( rv == 0 )
|
|
|
59062c0 |
@@ -132,7 +138,7 @@
|
|
|
59062c0 |
char *cp, *ncp;
|
|
|
59062c0 |
short *nsp;
|
|
|
59062c0 |
Py_Int32 *nlp;
|
|
|
59062c0 |
- int len, size, x, y, newx, newy;
|
|
|
59062c0 |
+ int len, size, x, y, newx, newy, nlen;
|
|
|
59062c0 |
int ix, iy;
|
|
|
59062c0 |
int oix, oiy;
|
|
|
59062c0 |
PyObject *rv;
|
|
|
59062c0 |
@@ -145,12 +151,18 @@
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "Size should be 1, 2 or 4");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
- if ( len != size*x*y ) {
|
|
|
59062c0 |
+ if ( ( len != size*x*y ) ||
|
|
|
59062c0 |
+ ( size != ((len / x) / y) ) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
+ nlen = newx*newy*size;
|
|
|
59062c0 |
+ if ( size != ((nlen / newx) / newy) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
|
|
|
59062c0 |
- rv = PyString_FromStringAndSize(NULL, newx*newy*size);
|
|
|
59062c0 |
+ rv = PyString_FromStringAndSize(NULL, nlen);
|
|
|
59062c0 |
if ( rv == 0 )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
ncp = (char *)PyString_AsString(rv);
|
|
|
59062c0 |
@@ -190,7 +202,8 @@
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "Size should be 1 or 4");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
- if ( maxx*maxy*width != len ) {
|
|
|
59062c0 |
+ if ( ( maxx*maxy*width != len ) ||
|
|
|
59062c0 |
+ ( maxx != ((len / maxy) / width) ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -240,7 +253,8 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#iii", &cp, &len, &x, &y, &tres) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- if ( x*y != len ) {
|
|
|
59062c0 |
+ if ( ( x*y != len ) ||
|
|
|
59062c0 |
+ ( x != len / y ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -281,7 +295,8 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- if ( x*y != len ) {
|
|
|
59062c0 |
+ if ( ( x*y != len ) ||
|
|
|
59062c0 |
+ ( x != len / y ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -320,7 +335,8 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- if ( x*y != len ) {
|
|
|
59062c0 |
+ if ( ( x*y != len ) ||
|
|
|
59062c0 |
+ ( x != len / y ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -358,7 +374,8 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- if ( x*y != len ) {
|
|
|
59062c0 |
+ if ( ( x*y != len ) ||
|
|
|
59062c0 |
+ ( x != len / y ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -404,7 +421,8 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- if ( x*y != len ) {
|
|
|
59062c0 |
+ if ( ( x*y != len ) ||
|
|
|
59062c0 |
+ ( x != len / y ) ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
}
|
|
|
59062c0 |
@@ -443,7 +461,11 @@
|
|
|
59062c0 |
if ( !PyArg_ParseTuple(args, "s#iiii", &cp, &len, &x, &y, &v0, &v1) )
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
- nlen = x*y;
|
|
|
59062c0 |
+ nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( (nlen+7)/8 != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -481,6 +503,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( (nlen+3)/4 != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -517,6 +543,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( (nlen+1)/2 != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -554,6 +584,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( nlen*4 != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -598,6 +632,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( nlen != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -648,6 +686,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( nlen*4 != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
@@ -693,6 +735,10 @@
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
|
|
|
59062c0 |
nlen = x*y;
|
|
|
59062c0 |
+ if ( x != (nlen / y) ) {
|
|
|
59062c0 |
+ PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
+ return 0;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if ( nlen != len ) {
|
|
|
59062c0 |
PyErr_SetString(ImageopError, "String has incorrect length");
|
|
|
59062c0 |
return 0;
|
|
|
59062c0 |
Only in Python-2.5/Modules: imageop.c~
|
|
|
59062c0 |
Only in Python-2.5/Modules: imageop.c.cve2007-4965
|
|
|
59062c0 |
diff -ru Python-2.5-orig/Modules/rgbimgmodule.c Python-2.5/Modules/rgbimgmodule.c
|
|
|
59062c0 |
--- Python-2.5-orig/Modules/rgbimgmodule.c 2006-08-11 23:18:50.000000000 -0400
|
|
|
59062c0 |
+++ Python-2.5/Modules/rgbimgmodule.c 2007-10-19 01:05:44.000000000 -0400
|
|
|
59062c0 |
@@ -299,6 +299,11 @@
|
|
|
59062c0 |
xsize = image.xsize;
|
|
|
59062c0 |
ysize = image.ysize;
|
|
|
59062c0 |
zsize = image.zsize;
|
|
|
59062c0 |
+ tablen = xsize * ysize * zsize * sizeof(Py_Int32);
|
|
|
59062c0 |
+ if (xsize != (((tablen / ysize) / zsize) / sizeof(Py_Int32))) {
|
|
|
59062c0 |
+ PyErr_NoMemory();
|
|
|
59062c0 |
+ goto finally;
|
|
|
59062c0 |
+ }
|
|
|
59062c0 |
if (rle) {
|
|
|
59062c0 |
tablen = ysize * zsize * sizeof(Py_Int32);
|
|
|
59062c0 |
starttab = (Py_Int32 *)malloc(tablen);
|
|
|
59062c0 |
Only in Python-2.5/Modules: rgbimgmodule.c.cve2007-4965
|
|
|
59062c0 |
Only in Python-2.5/Modules: _tkinter.c.tkinter
|