1 files changed, 8 insertions, 0 deletions

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)
           {