* image.c (xbm_image_p): Don't assume stated width and height fit in int.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 62d6a5b4a04..c034bba6fa8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * image.c (xbm_image_p): Don't assume stated width and height fit in int.
+
         * lisp.h (lint_assume): New macro.
         * composite.c (composition_gstring_put_cache):
         * ftfont.c (ftfont_shape_by_flt): Use it to pacify GCC 4.6.0.
diff --git a/src/image.c b/src/image.c
index 495bfdc0eef..352f8c486e4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2308,7 +2308,7 @@ xbm_image_p (Lisp_Object object)
   else
     {
       Lisp_Object data;
-      int width, height;
+      EMACS_INT width, height;
 
       /* Entries for `:width', `:height' and `:data' must be present.  */
       if (!kw[XBM_WIDTH].count
@@ -2324,7 +2324,7 @@ xbm_image_p (Lisp_Object object)
          data.  */
       if (VECTORP (data))
         {
-          int i;
+          EMACS_INT i;
 
           /* Number of elements of the vector must be >= height.  */
           if (ASIZE (data) < height)