[sfnt] Fix previous commit (#48901).

* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
8 years ago · 69ce97391c
parent acd1879897
commit 69ce97391c
2 changed files with 7 additions and 4 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2016-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix previous commit (#48901).
+
+	* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
+
 2016-08-25  Werner Lemberg  <wl@gnu.org>

 	[sfnt] Speed up handling of invalid format 4 cmaps.
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@ -1376,7 +1376,7 @@

          /* if p > limit, the whole segment is invalid */
          if ( next && p > limit )
-            continue;
+            break;

          gindex = TT_PEEK_USHORT( p );
          if ( gindex )
@ -1404,9 +1404,6 @@
            else if ( (FT_Int)charcode + delta < 0x10000L &&
                      (FT_Int)end + delta >= 0x10000L     )
              charcode = (FT_UInt)( 0x10000L - delta );
-
-            else
-              continue;
          }
        }