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

[truetype] Fix `cvar' sanity test. 

Reported by Dave Arnold.

* src/truetype/ttgxvar.c (tt_face_vary_cvt): Use tuple count mask.
This commit is contained in:
Werner Lemberg 2016-12-16 11:38:20 +01:00
parent 6862024854
commit df2cf43e94
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2016-12-16 Werner Lemberg <wl@gnu.org>
[truetype] Fix `cvar' sanity test.
Reported by Dave Arnold.
* src/truetype/ttgxvar.c (tt_face_vary_cvt): Use tuple count mask.
2016-12-16 Werner Lemberg <wl@gnu.org>
[cff, truetype] Remove compiler warnings; fix `make multi'.

3
src/truetype/ttgxvar.c
View File

@ -2020,7 +2020,8 @@
offsetToData = FT_GET_USHORT();
/* rough sanity test */
if ( offsetToData + tupleCount * 4 > table_len )
if ( offsetToData + ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) * 4 >
table_len )
{
FT_TRACE2(( "tt_face_vary_cvt:"
" invalid CVT variation array header\n" ));