From b8968d666eca94531141cfc58e13102084b5472f Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Sat, 1 May 2021 12:24:44 -0400 Subject: [PATCH] * src/sfnt/ttpost.c (load_format_{20,25}): Tweak allocaton macros. --- ChangeLog | 4 ++++ src/sfnt/ttpost.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3556c772d..1114a78e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-05-01 Alexei Podtelezhnikov + + * src/sfnt/ttpost.c (load_format_{20,25}): Tweak allocaton macros. + 2021-05-01 Alexei Podtelezhnikov * src/sfnt/pngshim.c (Load_SBit_Png): Tweak allocaton macro. diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index f42143e91..6d34ce4e7 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -190,8 +190,8 @@ FT_Int n; - if ( FT_NEW_ARRAY ( glyph_indices, num_glyphs ) || - FT_FRAME_ENTER( num_glyphs * 2L ) ) + if ( FT_QNEW_ARRAY ( glyph_indices, num_glyphs ) || + FT_FRAME_ENTER( num_glyphs * 2L ) ) goto Fail; for ( n = 0; n < num_glyphs; n++ ) @@ -227,7 +227,7 @@ FT_UShort n; - if ( FT_NEW_ARRAY( name_strings, num_names ) ) + if ( FT_QNEW_ARRAY( name_strings, num_names ) ) goto Fail; for ( n = 0; n < num_names; n++ ) @@ -259,8 +259,8 @@ len = (FT_UInt)FT_MAX( 0, d ); } - if ( FT_NEW_ARRAY( name_strings[n], len + 1 ) || - FT_STREAM_READ( name_strings[n], len ) ) + if ( FT_QNEW_ARRAY( name_strings[n], len + 1 ) || + FT_STREAM_READ( name_strings[n], len ) ) goto Fail1; name_strings[n][len] = '\0'; @@ -273,7 +273,7 @@ " using NULL names for gid %d - %d\n", n, num_names - 1 )); for ( ; n < num_names; n++ ) - if ( FT_NEW_ARRAY( name_strings[n], 1 ) ) + if ( FT_QNEW_ARRAY( name_strings[n], 1 ) ) goto Fail1; else name_strings[n][0] = '\0'; @@ -336,7 +336,7 @@ goto Exit; } - if ( FT_NEW_ARRAY( offset_table, num_glyphs ) || + if ( FT_QNEW_ARRAY( offset_table, num_glyphs ) || FT_STREAM_READ( offset_table, num_glyphs ) ) goto Fail;