[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:
parent
6862024854
commit
df2cf43e94
|
@ -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>
|
2016-12-16 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[cff, truetype] Remove compiler warnings; fix `make multi'.
|
[cff, truetype] Remove compiler warnings; fix `make multi'.
|
||||||
|
|
|
@ -2020,7 +2020,8 @@
|
||||||
offsetToData = FT_GET_USHORT();
|
offsetToData = FT_GET_USHORT();
|
||||||
|
|
||||||
/* rough sanity test */
|
/* 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:"
|
FT_TRACE2(( "tt_face_vary_cvt:"
|
||||||
" invalid CVT variation array header\n" ));
|
" invalid CVT variation array header\n" ));
|
||||||
|
|
Loading…
Reference in New Issue