rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Alexei Podtelezhnikov 2021-05-05 23:30:46 -04:00
parent 82fd32d674
commit 8150ed0db2
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2021-05-05 Alexei Podtelezhnikov <apodtele@gmail.com>
[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.
2021-05-04 Ben Wagner <bungeman@chromium.org>
* src/cid/cidload.c (cid_hex_to_binary): Improve return value.

14
src/cff/cffload.c
View File

@ -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,

2
src/psaux/psarrst.c
View File

@ -110,7 +110,7 @@
FT_ASSERT( newSize > 0 ); /* avoid realloc with zero size */
if ( !FT_REALLOC( arrstack->ptr, arrstack->totalSize, newSize ) )
if ( !FT_QREALLOC( arrstack->ptr, arrstack->totalSize, newSize ) )
{
arrstack->allocated = numElements;
arrstack->totalSize = newSize;

3
src/psaux/psstack.c
View File

@ -59,10 +59,9 @@
CF2_Stack stack = NULL;
if ( FT_NEW( stack ) )
if ( FT_QNEW( stack ) )
return NULL;
/* initialize the structure; FT_NEW zeroes it */
stack->memory = memory;
stack->error = e;