[Git][freetype/freetype][master] Fix typos in memory macros.

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

c71eb22d

by Ben Wagner at 2021-10-15T22:18:38-04:00

Fix typos in memory macros.

FT_QNEW_ARRAY and FT_QRENEW_ARRAY were using the non-Q
FT_MEM_NEW_ARRAY and FT_MEM_RENEW_ARRAY. Change these to use the Q
versions. Also fix the one issue discovered in tt_face_load_name
where table->names is created with FT_QNEW_ARRAY but the extra
string member is not initialized to NULL.

* include/freetype/internal/ftmemory.h (FT_Q(RE)NEW_ARRAY):
Use FT_MEM_Q(RE)NEW_ARRAY as needed.

* src/sfnt/ttload.c (tt_face_load_name): Initialize `entry->string`.

2 changed files:

include/freetype/internal/ftmemory.h
src/sfnt/ttload.c

Changes:

include/freetype/internal/ftmemory.h

@@ -344,14 +344,13 @@ extern "C++"
  #define FT_RENEW_ARRAY( ptr, curcnt, newcnt )                           \
            FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
 -#define FT_QNEW( ptr )                           \
 -          FT_MEM_SET_ERROR( FT_MEM_QNEW( ptr ) )
 +#define FT_QNEW( ptr )  FT_MEM_SET_ERROR( FT_MEM_QNEW( ptr ) )
 -#define FT_QNEW_ARRAY( ptr, count )                          \
 -          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
 +#define FT_QNEW_ARRAY( ptr, count )                           \
 +          FT_MEM_SET_ERROR( FT_MEM_QNEW_ARRAY( ptr, count ) )
 -#define FT_QRENEW_ARRAY( ptr, curcnt, newcnt )                          \
 -          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
 +#define FT_QRENEW_ARRAY( ptr, curcnt, newcnt )                           \
 +          FT_MEM_SET_ERROR( FT_MEM_QRENEW_ARRAY( ptr, curcnt, newcnt ) )
    FT_BASE( FT_Pointer )

src/sfnt/ttload.c


           }
         }
 
+        /* mark the string as not yet converted */
+        entry->string = NULL;
+
         entry++;
       }
 

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] Fix typos in memory macros.
Date:	Sat, 16 Oct 2021 02:28:09 +0000

...	...	@@ -988,6 +988,9 @@
988	988	}
989	989	}
990	990
	991	+ /* mark the string as not yet converted */
	992	+ entry->string = NULL;
	993	+
991	994	entry++;
992	995	}
993	996