1 files changed, 5 insertions, 1 deletions

diff --git a/src/image.c b/src/image.c
index b8317b1e982..eacea4a1d97 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5742,9 +5742,13 @@ pbm_load (f, img)
     }
   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;