minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[truetype] Improve bounds checks for `ItemVariationStore`. 

* src/truetype/ttgxvar.c (tt_hvadvance_adjust): Move bounds check ...
(tt_var_get_item_delta): ...  to this function, because it is safer.  For
example, the 'avar' table 2.0 codepath was not performing a bounds check at
all.
This commit is contained in:
Behdad Esfahbod 2022-11-09 15:42:25 -07:00 committed by Werner Lemberg
parent 9be958ca39
commit e97cb9e8da
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/truetype/ttgxvar.c
View File

@ -996,10 +996,16 @@
/* See pseudo code from `Font Variations Overview' */
/* in the OpenType specification. */
if ( outerIndex >= itemStore->dataCount )
return 0; /* Out of range. */
varData = &itemStore->varData[outerIndex];
deltaSet = FT_OFFSET( varData->deltaSet,
varData->regionIdxCount * innerIndex );
if ( innerIndex >= varData->itemCount )
return 0; /* Out of range. */
if ( FT_QNEW_ARRAY( scalars, varData->regionIdxCount ) )
return 0;
@ -1171,20 +1177,9 @@
}
else
{
GX_ItemVarData varData;
/* no widthMap data */
outerIndex = 0;
innerIndex = gindex;
varData = &table->itemStore.varData[outerIndex];
if ( gindex >= varData->itemCount )
{
FT_TRACE2(( "gindex %d out of range\n", gindex ));
error = FT_THROW( Invalid_Argument );
goto Exit;
}
}
delta = tt_var_get_item_delta( face,