From 69ce97391cc2e7cbc4b6e2e7b7e62708a46280c6 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 25 Aug 2016 19:49:52 +0200 Subject: [PATCH] [sfnt] Fix previous commit (#48901). * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos. --- ChangeLog | 6 ++++++ src/sfnt/ttcmap.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fc1a9d5e..07e190edc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-08-25 Werner Lemberg + + [sfnt] Fix previous commit (#48901). + + * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Thinkos. + 2016-08-25 Werner Lemberg [sfnt] Speed up handling of invalid format 4 cmaps. diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 0e0479d93..cd7467d4d 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; } }