aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorPaul Eggert2011-07-12 20:42:26 -0700
committerPaul Eggert2011-07-12 20:42:26 -0700
commit5adf60bc2313a220185c9f22d3d539a0dc51b228 (patch)
tree4e7beda7a3112b3bd9f39f848c43c45efbc12b32 /src/image.c
parent2b64ccd2b5916083a421b0263a5bc1d3d075d82b (diff)
downloademacs-5adf60bc2313a220185c9f22d3d539a0dc51b228.tar.gz
emacs-5adf60bc2313a220185c9f22d3d539a0dc51b228.zip
* image.c (png_load): Don't assume height * row_bytes fits in 'int'.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c
index f6626f61c83..1b6e67b4404 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5558,7 +5558,8 @@ png_load (struct frame *f, struct image *img)
5558{ 5558{
5559 Lisp_Object file, specified_file; 5559 Lisp_Object file, specified_file;
5560 Lisp_Object specified_data; 5560 Lisp_Object specified_data;
5561 int x, y, i; 5561 int x, y;
5562 ptrdiff_t i;
5562 XImagePtr ximg, mask_img = NULL; 5563 XImagePtr ximg, mask_img = NULL;
5563 png_struct *png_ptr = NULL; 5564 png_struct *png_ptr = NULL;
5564 png_info *info_ptr = NULL, *end_info = NULL; 5565 png_info *info_ptr = NULL, *end_info = NULL;