From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 18 Mar 2007 23:09:57 +0000 (+0000)
Subject: (pbm_load): Signal error for invalid image size.
X-Git-Tag: emacs-pretest-22.0.96~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39e653ead8fb85137f5d5d060ad658150c698486;p=emacs.git

(pbm_load): Signal error for invalid image size.
---

diff --git a/src/image.c b/src/image.c
index c58e0d4695e..b8317b1e982 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5742,6 +5742,14 @@ pbm_load (f, img)
     }
   else
     {
+      if (raw_p && (p + 3 * height * width > end))
+	{
+	  x_destroy_x_image (ximg);
+	  image_error ("Invalid image size in image `%s'",
+		       img->spec, Qnil);
+	  goto error;
+	}
+
       for (y = 0; y < height; ++y)
 	for (x = 0; x < width; ++x)
 	  {