procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(gif_load): Fix size of allocated image buffer

Browse source 
for images where a sub-image may be larger than the image's
total height/width specifications.
This commit is contained in:
Kim F. Storm 2005-09-28 10:48:20 +00:00
parent 64da575986
commit 0f4aca467e
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/image.c
View file

@ -7369,8 +7369,17 @@ gif_load (f, img)
return 0;
}
width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height);
image_top = gif->SavedImages[ino].ImageDesc.Top;
image_left = gif->SavedImages[ino].ImageDesc.Left;
image_width = gif->SavedImages[ino].ImageDesc.Width;
image_height = gif->SavedImages[ino].ImageDesc.Height;
width = img->width = max (gif->SWidth,
max (gif->Image.Left + gif->Image.Width,
image_left + image_width));
height = img->height = max (gif->SHeight,
max (gif->Image.Top + gif->Image.Height,
image_top + image_height));
/* Create the X image and pixmap. */
if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
@ -7405,11 +7414,6 @@ gif_load (f, img)
requires more than can be done here (see the gif89 spec,
disposal methods). Let's simply assume that the part
not covered by a sub-image is in the frame's background color. */
image_top = gif->SavedImages[ino].ImageDesc.Top;
image_left = gif->SavedImages[ino].ImageDesc.Left;
image_width = gif->SavedImages[ino].ImageDesc.Width;
image_height = gif->SavedImages[ino].ImageDesc.Height;
for (y = 0; y < image_top; ++y)
for (x = 0; x < width; ++x)
XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));