Commit 69ce97391cc2e7cbc4b6e2e7b7e62708a46280c6

Werner Lemberg 2016-08-25T19:49:52

[sfnt] Fix previous commit (#48901). * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.

diff --git a/ChangeLog b/ChangeLog
index 0fc1a9d..07e190e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 
 	* src/sfnt/ttcmap.c (tt_cmap4_next, tt_cmap4_char_map_binary): Add
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 0e0479d..cd7467d 100644
--- 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;
           }
         }