diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-05-05 23:30:46 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-05-05 23:30:46 -0400 |
| commit | 8150ed0db23ce7d82c6e145636255fab31b90ecf (patch) | |
| tree | d3f43d789c98847990069cc102aa5a90e96ba189 /src/cff | |
| parent | 82fd32d67426f4d58663d3d382478473c95ac27c (diff) | |
| download | freetype2-8150ed0db23ce7d82c6e145636255fab31b90ecf.tar.gz | |
[cff,psaux] Avoid memory zeroing (contd.).
* src/cff/cffload.c (cff_blend_doBlend, cff_blend_build_vector): Tweak
allocation macros.
* src/psaux/psarrst.c (cf2_arrstack_setNumElements): Ditto.
* src/psaux/psstack.c (cf2_stack_init): Ditto.
Diffstat (limited to 'src/cff')
| -rw-r--r-- | src/cff/cffload.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 9ad00d896..4a4010d61 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -1320,9 +1320,9 @@ /* increase or allocate `blend_stack' and reset `blend_top'; */ /* prepare to append `numBlends' values to the buffer */ - if ( FT_REALLOC( subFont->blend_stack, - subFont->blend_alloc, - subFont->blend_alloc + size ) ) + if ( FT_QREALLOC( subFont->blend_stack, + subFont->blend_alloc, + subFont->blend_alloc + size ) ) goto Exit; subFont->blend_top = subFont->blend_stack + subFont->blend_used; @@ -1435,9 +1435,7 @@ /* prepare buffer for the blend vector */ len = varData->regionIdxCount + 1; /* add 1 for default component */ - if ( FT_REALLOC( blend->BV, - blend->lenBV * sizeof( *blend->BV ), - len * sizeof( *blend->BV ) ) ) + if ( FT_QRENEW_ARRAY( blend->BV, blend->lenBV, len ) ) goto Exit; blend->lenBV = len; @@ -1539,9 +1537,7 @@ if ( lenNDV != 0 ) { /* user has set a normalized vector */ - if ( FT_REALLOC( blend->lastNDV, - blend->lenNDV * sizeof ( *NDV ), - lenNDV * sizeof ( *NDV ) ) ) + if ( FT_QRENEW_ARRAY( blend->lastNDV, blend->lenNDV, lenNDV ) ) goto Exit; FT_MEM_COPY( blend->lastNDV, |