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

[truetype] Fix commit from 2014-11-24. 

Problem reported by Hin-Tak Leung  <htl10@users.sourceforge.net>.

* src/truetype/ttpload.c (tt_face_load_hdmx): Fix file checking
logic.
This commit is contained in:
Werner Lemberg 2016-10-27 07:27:27 +02:00
parent 9c45ac3966
commit ddf3872699
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2016-10-27 Werner Lemberg <wl@gnu.org>
[truetype] Fix commit from 2014-11-24.
Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
* src/truetype/ttpload.c (tt_face_load_hdmx): Fix file checking
logic.
2016-10-26 Werner Lemberg <wl@gnu.org>
Add `FT_Get_{MM,Var}_Blend_Coordinates' functions.

9
src/truetype/ttpload.c
View File

@ -563,10 +563,11 @@
record_size &= 0xFFFFU;
/* The limit for `num_records' is a heuristic value. */
if ( version != 0 ||
num_records > 255 ||
record_size > 0x10001L ||
record_size < 4 )
if ( version != 0 ||
num_records > 255 ||
( num_records > 0 &&
( record_size > 0x10001L ||
record_size < 4 ) ) )
{
error = FT_THROW( Invalid_File_Format );
goto Fail;