ref: 69ce97391cc2e7cbc4b6e2e7b7e62708a46280c6
parent: acd1879897cff476bb7e53c27d10f3e66b6f4b5c
author: Werner Lemberg <[email protected]>
date: Thu Aug 25 15:49:52 EDT 2016
[sfnt] Fix previous commit (#48901). * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-08-25 Werner Lemberg <[email protected]>
+ [sfnt] Fix previous commit (#48901).
+
+ * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos.
+
+2016-08-25 Werner Lemberg <[email protected]>
+
[sfnt] Speed up handling of invalid format 4 cmaps.
* src/sfnt/ttcmap.c (tt_cmap4_next, tt_cmap4_char_map_binary): Add
--- 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;
}
}