(read_anchor_array): Do not read an anchor if its

[m17n/libotf.git] / src / otfopen.c

diff --git a/src/otfopen.c b/src/otfopen.c
index 229bd40..dc4a64b 100644 (file)
--- a/src/otfopen.c
+++ b/src/otfopen.c
@@ -2336,8 +2336,9 @@ read_anchor_array (OTF *otf, OTF_Stream *stream, long offset,
     }
   for (i = 0; i < array->Count; i++)
     for (j = 0; j < ClassCount; j++)
-      if (read_anchor (otf, stream, offset + array->offset,
-                      &array->AnchorRecord[i].Anchor[j]) < 0)
+      if (array->AnchorRecord[i].Anchor[j].offset > 0
+         && read_anchor (otf, stream, offset + array->offset,
+                         &array->AnchorRecord[i].Anchor[j]) < 0)
        return -1;
   RESTORE_STREAM (stream, state);
   return 0;
@@ -2437,7 +2438,7 @@ read_ligature_attach (OTF *otf, OTF_Stream *stream, long offset,
                      unsigned ClassCount, OTF_LigatureAttach *attach)
 {
   char *errfmt = "LigatureAttach%s";
-  int errret = 1;
+  int errret = -1;
   int i, j;
 
   SEEK_STREAM (stream, offset + attach->offset);
@@ -2483,8 +2484,10 @@ read_ligature_array (OTF *otf, OTF_Stream *stream, long offset,
   for (i = 0; i < array->LigatureCount; i++)
     READ_OFFSET (stream, array->LigatureAttach[i].offset);
   for (i = 0; i < array->LigatureCount; i++)
-    read_ligature_attach (otf, stream, offset + array->offset,
-                         class_count, array->LigatureAttach + i);
+    if (array->LigatureAttach[i].offset > 0
+       && read_ligature_attach (otf, stream, offset + array->offset,
+                                class_count, array->LigatureAttach + i) < 0)
+      return -1;
   RESTORE_STREAM (stream, state);
   return 0;
 }
@@ -2625,7 +2628,7 @@ read_lookup_subtable_gpos (OTF *otf, OTF_Stream *stream,
          read_coverage (otf, stream, offset, &subtable->Coverage);
          read_coverage (otf, stream, offset,
                         &subtable->u.mark_mark1.Mark2Coverage);
-         READ_UINT16 (stream, subtable->u.mark_base1.ClassCount);
+         READ_UINT16 (stream, subtable->u.mark_mark1.ClassCount);
          read_mark_array (otf, stream, offset,
                           &subtable->u.mark_mark1.Mark1Array);
          read_anchor_array (otf, stream, offset,
@@ -3178,6 +3181,8 @@ OTF_check_features (OTF *otf, int gsubp,
 
   if (OTF_get_features (otf, gsubp) < 0)
     {
+      if (gsubp ? ! otf->gsub : ! otf->gpos)
+       return 0;
       for (i = 0; i < n_features; i++)
        {
          OTF_Tag feature = features[i];
@@ -3187,7 +3192,6 @@ OTF_check_features (OTF *otf, int gsubp,
          if ((((unsigned) feature) & 0x80000000) == 0)
            return -1;
        }
-      return 1;
     }
   if (gsubp)
     {
@@ -3209,8 +3213,10 @@ OTF_check_features (OTF *otf, int gsubp,
       for (i = 0; i < Script->LangSysCount && ! LangSys; i++)
        if (Script->LangSysRecord[i].LangSysTag == language)
          LangSys = Script->LangSys + i;
+      if (! LangSys)
+       return 0;
     }
-  if (! LangSys)
+  else
     LangSys = &Script->DefaultLangSys;
   for (j = 0; j < n_features; j++)
     {