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

Rework block allocator

Browse Source
This commit is contained in:
wiredfool 2016-05-21 07:24:20 -07:00
parent 768936fa33
commit 54a979749c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libImaging/Storage.c
View File

@ -345,27 +345,30 @@ ImagingNewBlock(const char *mode, int xsize, int ysize)
{
Imaging im;
Py_ssize_t y, i;
Py_ssize_t bytes;
im = ImagingNewPrologue(mode, xsize, ysize);
if (!im)
return NULL;
/* We shouldn't overflow, since the threshold defined
below says that we're only going to allocate max 4M
here before going to the array allocator. Check anyway.
*/
if (im->linesize &&
im->ysize > SIZE_MAX / im->linesize) {
im->ysize > INT_MAX / im->linesize) {
/* punt if we're going to overflow */
return NULL;
}
/* Use a single block */
bytes = ((Py_ssize_t) im->ysize) * im->linesize;
if (bytes <= 0)
if (im->ysize * im->linesize <= 0) {
/* some platforms return NULL for malloc(0); this fix
prevents MemoryError on zero-sized images on such
platforms */
bytes = 1;
/* malloc check ok, overflow check above */
im->block = (char *) calloc(bytes, 1);
im->block = (char *) malloc(1);
} else {
/* malloc check ok, overflow check above */
im->block = (char *) calloc(im->ysize, im->linesize);
}
if (im->block) {
for (y = i = 0; y < im->ysize; y++) {