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

45aebb64 · Paul Eggert · f2ed8a70 · 45aebb64 · 45aebb64
Commit 45aebb64 authored Jun 18, 2011 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/ChangeLog src/ChangeLog +2 -0

src/image.c src/image.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.

--- 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)