[Git][freetype/freetype][master] [truetype] Fix undefined pointer arithmetic.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 90527092
  by mlugg at 2022-09-29T20:44:41+02:00

  [truetype] Fix undefined pointer arithmetic.
  
  * src/truetype/ttgxvar.c (tt_var_get_item_delta, ft_var_load_mvar): Use
  `FT_OFFSET`.
  

1 changed file:

• src/truetype/ttgxvar.c

Changes:

src/truetype/ttgxvar.c

---

...	...	@@ -966,7 +966,8 @@
966	966	/* in the OpenType specification. */
967	967
968	968	varData = &itemStore->varData[outerIndex];
969		- deltaSet = &varData->deltaSet[varData->regionIdxCount * innerIndex];
	969	+ deltaSet = FT_OFFSET( varData->deltaSet,
	970	+ varData->regionIdxCount * innerIndex );
970	971
971	972	if ( FT_QNEW_ARRAY( scalars, varData->regionIdxCount ) )
972	973	return 0;
...	...	@@ -1353,7 +1354,7 @@
1353	1354	return;
1354	1355
1355	1356	value = blend->mvar_table->values;
1356		- limit = value + blend->mvar_table->valueCount;
	1357	+ limit = FT_OFFSET( value, blend->mvar_table->valueCount );
1357	1358	itemStore = &blend->mvar_table->itemStore;
1358	1359
1359	1360	for ( ; value < limit; value++ )
...	...	@@ -1386,7 +1387,7 @@
1386	1387	FT_TRACE2(( "loaded\n" ));
1387	1388
1388	1389	value = blend->mvar_table->values;
1389		- limit = value + blend->mvar_table->valueCount;
	1390	+ limit = FT_OFFSET( value, blend->mvar_table->valueCount );
1390	1391
1391	1392	/* save original values of the data MVAR is going to modify */
1392	1393	for ( ; value < limit; value++ )
...	...	@@ -1451,7 +1452,7 @@
1451	1452	return;
1452	1453
1453	1454	value = blend->mvar_table->values;
1454		- limit = value + blend->mvar_table->valueCount;
	1455	+ limit = FT_OFFSET( value, blend->mvar_table->valueCount );
1455	1456
1456	1457	for ( ; value < limit; value++ )
1457	1458	{

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help