Mercurial > emacs
changeset 80907:cb616238ccb2
(pbm_load): Correctly check image size for greyscale pbm.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 12 May 2007 23:55:51 +0000 |
| parents | e433e5f4e8ed |
| children | 0d313b9a7e36 |
| files | src/image.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Sat May 12 23:55:42 2007 +0000 +++ b/src/image.c Sat May 12 23:55:51 2007 +0000 @@ -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;