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

[sfnt] Fix Savannah bug #43656. 

* src/sfnt/ttcmap.c (tt_cmap4_validate): Fix order of validity
tests.
This commit is contained in:
Werner Lemberg 2014-11-22 06:24:45 +01:00
parent dd89710f0f
commit 9bd20b7304
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-11-22 Werner Lemberg <wl@gnu.org>
[sfnt] Fix Savannah bug #43656.
* src/sfnt/ttcmap.c (tt_cmap4_validate): Fix order of validity
tests.
2014-11-21 Werner Lemberg <wl@gnu.org>
[type1, type42] Fix Savannah bug #43655.

6
src/sfnt/ttcmap.c
View File

@ -845,9 +845,6 @@
p = table + 2; /* skip format */
length = TT_NEXT_USHORT( p );
if ( length < 16 )
FT_INVALID_TOO_SHORT;
/* in certain fonts, the `length' field is invalid and goes */
/* out of bound. We try to correct this here... */
if ( table + length > valid->limit )
@ -858,6 +855,9 @@
length = (FT_UInt)( valid->limit - table );
}
if ( length < 16 )
FT_INVALID_TOO_SHORT;
p = table + 6;
num_segs = TT_NEXT_USHORT( p ); /* read segCountX2 */