python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 09:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

move checks before mallocs to prevent memory leaks

Browse Source
This commit is contained in:
homm 2016-05-01 17:31:54 +03:00
parent 73c81404e6
commit a5b99dd302
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libImaging/Resample.c
View File

@ -139,11 +139,11 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
kmax = (int) ceil(support) * 2 + 1; kmax = (int) ceil(support) * 2 + 1;
// check for overflow // check for overflow
if (kmax > 0 && xsize > SIZE_MAX / kmax) if (xsize > SIZE_MAX / (kmax * sizeof(float)))
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
// sizeof(float) should be greater than 0 // sizeof(int) should be greater than 0 as well
if (xsize * kmax > SIZE_MAX / sizeof(float)) if (xsize > SIZE_MAX / (2 * sizeof(int)))
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
/* coefficient buffer */ /* coefficient buffer */
@ -151,10 +151,6 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
if ( ! kk) if ( ! kk)
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
// sizeof(int) should be greater than 0 as well
if (xsize > SIZE_MAX / (2 * sizeof(int)))
return (Imaging) ImagingError_MemoryError();
xbounds = malloc(xsize * 2 * sizeof(int)); xbounds = malloc(xsize * 2 * sizeof(int));
if ( ! xbounds) { if ( ! xbounds) {
free(kk); free(kk);