From a0fb6dbcd9ecac640fd34d97cf332c32df7465af Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Fri, 23 Apr 2021 00:05:18 -0400 Subject: [PATCH] [pcf,bdf,winfonts] s/FT_ALLOC/FT_QALLOC/ for initialized buffers. * src/pcf/pcfread.c (pcf_interpret_style): Do not zero out the buffer. * src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto. * src/winfonts/winfnt.c (FNT_Face_Init, FNT_Load_Glyph): Ditto. --- ChangeLog | 8 ++++++++ src/bdf/bdfdrivr.c | 2 +- src/pcf/pcfread.c | 2 +- src/winfonts/winfnt.c | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cf4c53bd..a94e8314e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-04-23 Alexei Podtelezhnikov + + [pcf,bdf,winfonts] s/FT_ALLOC/FT_QALLOC/ for initialized buffers. + + * src/pcf/pcfread.c (pcf_interpret_style): Do not zero out the buffer. + * src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto. + * src/winfonts/winfnt.c (FNT_Face_Init, FNT_Load_Glyph): Ditto. + 2021-04-22 Alexei Podtelezhnikov [cache] Optimize SBit copying. diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index d29188b97..f94ebbe4f 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -276,7 +276,7 @@ THE SOFTWARE. char* s; - if ( FT_ALLOC( face->style_name, len ) ) + if ( FT_QALLOC( face->style_name, len ) ) return error; s = face->style_name; diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 2cad854a7..737fbce0c 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -1368,7 +1368,7 @@ THE SOFTWARE. char* s; - if ( FT_ALLOC( face->style_name, len ) ) + if ( FT_QALLOC( face->style_name, len ) ) return error; s = face->style_name; diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 17b068f21..1d52bb600 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -888,7 +888,7 @@ /* NULL byte -- the frame is erroneously one byte too small. */ /* We thus allocate one more byte, setting it explicitly to */ /* zero. */ - if ( FT_ALLOC( font->family_name, family_size + 1 ) ) + if ( FT_QALLOC( font->family_name, family_size + 1 ) ) goto Fail; FT_MEM_COPY( font->family_name, @@ -1094,7 +1094,7 @@ /* note: since glyphs are stored in columns and not in rows we */ /* can't use ft_glyphslot_set_bitmap */ - if ( FT_ALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) ) + if ( FT_QALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) ) goto Exit; column = (FT_Byte*)bitmap->buffer;