From: Kenichi Handa <handa@etlken>
Date: Mon, 26 Jul 2010 04:28:02 +0000 (+0900)
Subject: font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of glyphs gets... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~137
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfe3c90fa5974e200483297e11bb889d0589b8f5;p=emacs.git

font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of glyphs gets smaller than the original length.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 414f22d3bfd..7e79e65b0c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-26  Kenichi Handa  <handa@m17n.org>
+
+	* font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the
+	number of glyphs gets smaller than the original length.
+
 2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* alloc.c (emacs_blocked_free, emacs_blocked_malloc)
diff --git a/src/font.c b/src/font.c
index cb3e9c5d326..ed4da9c75ac 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4492,6 +4492,8 @@ created glyph-string.  Otherwise, the value is nil.  */)
     }
   if (i == 3 || XINT (n) == 0)
     return Qnil;
+  if (XINT (n) < LGSTRING_GLYPH_LEN (gstring))
+    LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil);
 
   glyph = LGSTRING_GLYPH (gstring, 0);
   from = LGLYPH_FROM (glyph);