ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a valid...

diff --git a/src/ChangeLog b/src/ChangeLog
index 07cc8dac1b3c5fdd0d7f9c980eb76a4e0302abb5..80bc42fa8c688a9854f0f28dff0c28331261d41c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-19  Kenichi Handa  <handa@m17n.org>
+
+       * ftfont.c (ftfont_drive_otf): Mask bits of character code to make
+       it fit in a valid range (Bug#11003).
+
 2012-03-12  Chong Yidong  <cyd@gnu.org>
 
        * eval.c (inhibit_lisp_code): Rename from

diff --git a/src/ftfont.c b/src/ftfont.c
index 3c45eb2f72f1e4e24ac5ae4c81189639661f180e..131465b4f85f21f69d21f4cdae6469e0b3e4c0ec 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1856,7 +1856,7 @@ ftfont_drive_otf (MFLTFont *font,
   setup_otf_gstring (len);
   for (i = 0; i < len; i++)
     {
-      otf_gstring.glyphs[i].c = in->glyphs[from + i].c;
+      otf_gstring.glyphs[i].c = in->glyphs[from + i].c & 0x11FFFF;
       otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code;
     }