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

[truetype] Fix undefined pointer arithmetic. 

* src/truetype/ttgxvar.c (tt_var_get_item_delta, ft_var_load_mvar): Use
`FT_OFFSET`.
This commit is contained in:
mlugg 2022-09-29 18:38:06 +01:00 committed by Werner Lemberg
parent ff66e912d0
commit 905270925d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/truetype/ttgxvar.c
View File

@ -966,7 +966,8 @@
/* in the OpenType specification. */
varData = &itemStore->varData[outerIndex];
deltaSet = &varData->deltaSet[varData->regionIdxCount * innerIndex];
deltaSet = FT_OFFSET( varData->deltaSet,
varData->regionIdxCount * innerIndex );
if ( FT_QNEW_ARRAY( scalars, varData->regionIdxCount ) )
return 0;
@ -1353,7 +1354,7 @@
return;
value = blend->mvar_table->values;
limit = value + blend->mvar_table->valueCount;
limit = FT_OFFSET( value, blend->mvar_table->valueCount );
itemStore = &blend->mvar_table->itemStore;
for ( ; value < limit; value++ )
@ -1386,7 +1387,7 @@
FT_TRACE2(( "loaded\n" ));
value = blend->mvar_table->values;
limit = value + blend->mvar_table->valueCount;
limit = FT_OFFSET( value, blend->mvar_table->valueCount );
/* save original values of the data MVAR is going to modify */
for ( ; value < limit; value++ )
@ -1451,7 +1452,7 @@
return;
value = blend->mvar_table->values;
limit = value + blend->mvar_table->valueCount;
limit = FT_OFFSET( value, blend->mvar_table->valueCount );
for ( ; value < limit; value++ )
{