[Emacs-diffs] Changes to emacs/src/ftfont.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/10/17 02:20:14

Index: ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ftfont.c    12 Oct 2008 12:50:02 -0000      1.32
+++ ftfont.c    17 Oct 2008 02:20:13 -0000      1.33
@@ -1340,7 +1340,7 @@
      OTF_GSUB_GPOS *gsub_gpos;
 {
   Lisp_Object scripts, langsyses, features, sym;
-  int i, j, k;
+  int i, j, k, l;
 
   for (scripts = Qnil, i = gsub_gpos->ScriptList.ScriptCount - 1; i >= 0; i--)
     {
@@ -1359,7 +1359,10 @@
 
          for (features = Qnil, k = otf_langsys->FeatureCount - 1; k >= 0; k--)
            {
-             OTF_TAG_SYM (sym, gsub_gpos->FeatureList.Feature[k].FeatureTag);
+             l = otf_langsys->FeatureIndex[k];
+             if (l > gsub_gpos->FeatureList.FeatureCount)
+               continue;
+             OTF_TAG_SYM (sym, gsub_gpos->FeatureList.Feature[l].FeatureTag);
              features = Fcons (sym, features);
            }
          if (j >= 0)