[AC21.5] Fix for GIF crash

Here is Adam Sjøgren's patch to fix the crashes associated with issue 713. I will apply this patch tonight after I flee my corporate firewall. - Vin --- src/ChangeLog~ 2010-08-22 20:05:51.000000000 -0400 +++ src/ChangeLog 2010-08-26 12:12:58.984375000 -0400 ＠＠ -0,0 +1,6 ＠＠ +2010-08-26 Adam Sjøgren <asjo(a)koldfront.dk&gt; + + * glyphs-eimage.c (gif_instantiate): Try harder to find an + appropriate GIF colormap and then flag an error if one can't be + found. + --- src/glyphs-eimage.c~ 2010-03-30 19:08:09.000000000 -0400 +++ src/glyphs-eimage.c 2010-08-26 11:44:15.328125000 -0400 ＠＠ -694,7 +694,7 ＠＠ /* 3. Now create the EImage(s) */ { - ColorMapObject *cmo = unwind.giffile->SColorMap; + ColorMapObject *cmo = (unwind.giffile->Image.ColorMap ? unwind.giffile->Image.ColorMap: unwind.giffile->SColorMap); int i, j, row, pass, interlace, slice; UINT_64_BIT pixels_sq; Binbyte *eip; ＠＠ -703,6 +703,9 ＠＠ static int InterlacedOffset[] = { 0, 4, 2, 1 }; static int InterlacedJumps[] = { 8, 8, 4, 2 }; + if (cmo == NULL) + signal_image_error ("GIF image has no color map", instantiator); + height = unwind.giffile->SHeight; width = unwind.giffile->SWidth; pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches