[Emacs-diffs] Changes to emacs/src/image.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/05/12 23:55:51

Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- image.c     18 Mar 2007 23:09:57 -0000      1.65
+++ image.c     12 May 2007 23:55:51 -0000      1.66
@@ -5742,9 +5742,13 @@
     }
   else
     {
-      if (raw_p && (p + 3 * height * width > end))
+      if (raw_p
+         && ((type == PBM_GRAY)
+             ? (p + height * width > end)
+             : (p + 3 * height * width > end)))
        {
          x_destroy_x_image (ximg);
+         x_clear_image (f, img);
          image_error ("Invalid image size in image `%s'",
                       img->spec, Qnil);
          goto error;