2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3862ce46327..9513dfd8e64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (png_load): Don't assume height * row_bytes fits in 'int'.
+
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * bidi.c (bidi_dump_cached_states): Use pD to print ptrdiff_t.
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)
 {
   Lisp_Object file, specified_file;
   Lisp_Object specified_data;
-  int x, y, i;
+  int x, y;
+  ptrdiff_t i;
   XImagePtr ximg, mask_img = NULL;
   png_struct *png_ptr = NULL;
   png_info *info_ptr = NULL, *end_info = NULL;