From 37e731f0bd81249f8b43bada12adaa611b7a595b Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 5 Apr 2022 21:27:03 +0000 Subject: freetype2 : revert git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c') diff --git a/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c b/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c index 6603148a02a..b65c8a2f3e0 100644 --- a/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c +++ b/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c @@ -613,7 +613,7 @@ if ( FT_QREALLOC( buf, buf_size, new_size ) ) goto Exit; - cursor = avail; + cursor = (ptrdiff_t)buf_size; buf_size = new_size; } else @@ -623,6 +623,7 @@ FT_MEM_MOVE( buf, buf + start, bytes ); cursor = bytes; + avail -= bytes; start = 0; } refill = 1; @@ -1174,6 +1175,7 @@ font->props_size + 1 ) ) goto Exit; + fp = font->props + font->props_size; font->props_size++; } @@ -1535,6 +1537,8 @@ /* kept. */ FT_FREE( p->glyph_name ); } + + p->glyph_name = NULL; } /* Clear the flags that might be added when width and height are */ @@ -1949,7 +1953,7 @@ } } - if ( FT_QALLOC( p->font->internal, sizeof ( FT_HashRec ) ) ) + if ( FT_ALLOC( p->font->internal, sizeof ( FT_HashRec ) ) ) goto Exit; error = ft_hash_str_init( (FT_Hash)p->font->internal, memory ); if ( error ) -- cgit v1.2.3