Commit 38ecc949ce1bfe4ceb567df7d8c7daf1d620fd3a
2018-04-22T10:14:03
Another fix for handling invalid format 2 cmaps. The previous commit was incomplete. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7928 * src/sfnt/ttcmap.c (tt_cmap2_char_next): Adjust condition to avoid an endless loop.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/ChangeLog b/ChangeLog
index 57c617e..4dc8c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2018-04-22 Werner Lemberg <wl@gnu.org>
+
+ Another fix for handling invalid format 2 cmaps.
+
+ The previous commit was incomplete.
+
+ Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7928
+
+ * src/sfnt/ttcmap.c (tt_cmap2_char_next): Adjust condition to avoid
+ an endless loop.
+
2018-04-19 Werner Lemberg <wl@gnu.org
[autofit] Add support for Georgian Mtavruli characters.
@@ -9,7 +22,7 @@
* src/autofit/afscript.h: Add Mtavruli standard character.
-2018-03-13 Werner Lemberg <wl@gnu.org>
+2018-04-18 Werner Lemberg <wl@gnu.org>
Fix handling of invalid format 2 cmaps.
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 71a3c1e..07075cb 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -518,7 +518,7 @@
FT_UInt pos, idx;
- if ( char_lo > start + count )
+ if ( char_lo > start + count && charcode <= 0xFF )
{
/* this happens only for a malformed cmap */
charcode = 0x100;