python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-25 12:34:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed comparison between int and unsigned long

Browse Source
This commit is contained in:
Andrew Murray 2020-12-22 16:06:44 +11:00
parent d0c685fbfa
commit 26e5929617
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_imaging.c
View File

@ -3928,7 +3928,7 @@ _set_blocks_max(PyObject* self, PyObject* args)
"blocks_max should be greater than 0"); "blocks_max should be greater than 0");
return NULL; return NULL;
} }
else if ( blocks_max > SIZE_MAX/sizeof(ImagingDefaultArena.blocks_pool[0])) { else if ( (unsigned long)blocks_max > SIZE_MAX/sizeof(ImagingDefaultArena.blocks_pool[0])) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"blocks_max is too large"); "blocks_max is too large");
return NULL; return NULL;

2
src/libImaging/Draw.c
View File

@ -1630,7 +1630,7 @@ allocate(ImagingOutline outline, int extra)
/* malloc check ok, uses calloc for overflow */ /* malloc check ok, uses calloc for overflow */
e = calloc(outline->size, sizeof(Edge)); e = calloc(outline->size, sizeof(Edge));
} else { } else {
if (outline->size > INT_MAX / sizeof(Edge)) { if (outline->size > INT_MAX / (int)sizeof(Edge)) {
return NULL; return NULL;
} }
/* malloc check ok, overflow checked above */ /* malloc check ok, overflow checked above */

2
src/libImaging/RankFilter.c
View File

@ -72,7 +72,7 @@ ImagingRankFilter(Imaging im, int size, int rank)
/* malloc check ok, for overflow in the define below */ /* malloc check ok, for overflow in the define below */
if (size > INT_MAX / size || if (size > INT_MAX / size ||
size > INT_MAX / (size * sizeof(FLOAT32))) { size > INT_MAX / (size * (int)sizeof(FLOAT32))) {
return (Imaging) ImagingError_ValueError("filter size too large"); return (Imaging) ImagingError_ValueError("filter size too large");
} }

2
src/libImaging/Resample.c
View File

@ -208,7 +208,7 @@ precompute_coeffs(int inSize, float in0, float in1, int outSize,
ksize = (int) ceil(support) * 2 + 1; ksize = (int) ceil(support) * 2 + 1;
// check for overflow // check for overflow
if (outSize > INT_MAX / (ksize * sizeof(double))) { if (outSize > INT_MAX / (ksize * (int)sizeof(double))) {
ImagingError_MemoryError(); ImagingError_MemoryError();
return 0; return 0;
} }