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

[cff] Fix potential bugs in default NDV for CFF2. 

* src/cff/cffload.c (cff_blend_build_vector): Explicitly build blend
vector when `lenNDV' is zero; don't rely on zero-init.
Save `lenNDV' as part of cache key even when `lenNDV' is zero.
This commit is contained in:
Dave Arnold 2017-03-17 07:28:11 +01:00 committed by Werner Lemberg
parent 0bf95b585e
commit fdbef538f4
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2017-03-17 Dave Arnold <darnold@adobe.com>
[cff] Fix potential bugs in default NDV for CFF2.
* src/cff/cffload.c (cff_blend_build_vector): Explicitly build blend
vector when `lenNDV' is zero; don't rely on zero-init.
Save `lenNDV' as part of cache key even when `lenNDV' is zero.
2017-03-17 Dave Arnold <darnold@adobe.com>
[cff] Fix CFF2 stack allocation.

15
src/cff/cffload.c
View File

@ -1463,10 +1463,15 @@
/* Note: `lenNDV' could be zero. */
/* In that case, build default blend vector (1,0,0...). */
/* In the normal case, initialize each component to 1 */
/* before inner loop. */
if ( lenNDV != 0 )
blend->BV[master] = FT_FIXED_ONE; /* default */
if ( !lenNDV )
{
blend->BV[master] = 0;
continue;
}
/* In the normal case, initialize each component to 1 */
/* before inner loop. */
blend->BV[master] = FT_FIXED_ONE; /* default */
/* inner loop steps through axes in this region */
for ( j = 0; j < lenNDV; j++ )
@ -1529,12 +1534,12 @@
lenNDV * sizeof ( *NDV ) ) )
goto Exit;
blend->lenNDV = lenNDV;
FT_MEM_COPY( blend->lastNDV,
NDV,
lenNDV * sizeof ( *NDV ) );
}
blend->lenNDV = lenNDV;
blend->builtBV = TRUE;
Exit:

4
src/cff/cfftypes.h
View File

@ -112,8 +112,8 @@ FT_BEGIN_HEADER
FT_UInt shortDeltaCount; /* not used; always zero */
#endif
FT_UInt regionIdxCount; /* number of regions in this var data */
FT_UInt* regionIndices; /* array of `regionCount' indices; */
FT_UInt regionIdxCount; /* number of region indexes */
FT_UInt* regionIndices; /* array of `regionIdxCount' indices; */
/* these index `varRegionList' */
} CFF_VarData;