From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Jun 2011 16:15:19 +0000 (-0700)
Subject: * font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
X-Git-Tag: emacs-pretest-24.0.90~104^2~473^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebc96716caba6515eb7bd74cca252e1a36d6c99b;p=emacs.git

* font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e2683795934..360027cfa4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
+
 	* fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
 	Use much-faster test for byte-length change.
 	Don't assume string byte-length fits in 'int'.
diff --git a/src/font.c b/src/font.c
index ecb61ab6a53..4619ed68913 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4294,7 +4294,7 @@ created glyph-string.  Otherwise, the value is nil.  */)
 {
   struct font *font;
   Lisp_Object font_object, n, glyph;
-  int i, j, from, to;
+  EMACS_INT i, j, from, to;
 
   if (! composition_gstring_p (gstring))
     signal_error ("Invalid glyph-string: ", gstring);