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

do not request more lines than required

Browse Source
This commit is contained in:
Alexander 2017-09-17 01:34:57 +03:00
parent f2123b4222
commit a5034b54cd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libImaging/Storage.c
View File

@ -337,7 +337,6 @@ ImagingAllocateArray(Imaging im, int dirty)
lines_per_block = 1; lines_per_block = 1;
blocks_count = (im->ysize + lines_per_block - 1) / lines_per_block; blocks_count = (im->ysize + lines_per_block - 1) / lines_per_block;
/* One extra ponter is always NULL */ /* One extra ponter is always NULL */
im->blocks = (char **)calloc(sizeof(char *), blocks_count + 1); im->blocks = (char **)calloc(sizeof(char *), blocks_count + 1);
if ( ! im->blocks) { if ( ! im->blocks) {
@ -347,7 +346,11 @@ ImagingAllocateArray(Imaging im, int dirty)
/* Allocate image as an array of lines */ /* Allocate image as an array of lines */
for (y = 0, line_in_block = 0, current_block = 0; y < im->ysize; y++) { for (y = 0, line_in_block = 0, current_block = 0; y < im->ysize; y++) {
if (line_in_block == 0) { if (line_in_block == 0) {
p = (char *)_get_block(lines_per_block * linesize, dirty); int lines_remained = lines_per_block;
if (lines_remained > im->ysize - y) {
lines_remained = im->ysize - y;
}
p = (char *)_get_block(lines_remained * linesize, dirty);
if ( ! p) { if ( ! p) {
ImagingDestroyArray(im); ImagingDestroyArray(im);
break; break;