rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Werner Lemberg 2018-04-22 10:14:03 +02:00
parent 92e4662ba6
commit 38ecc949ce
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -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.

2
src/sfnt/ttcmap.c
View File

@ -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;