[freetype2] master c71eb22: Fix typos in memory macros.

[Werner Lemberg]

branch: master
commit c71eb22dde1a3101891a865fdac20a6de814267d
Author: Ben Wagner <bungeman@chromium.org>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    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`.
---
 include/freetype/internal/ftmemory.h | 11 +++++------
 src/sfnt/ttload.c                    |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/freetype/internal/ftmemory.h 
b/include/freetype/internal/ftmemory.h
index 3b98128..e20d949 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/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 )
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 944d3d4..d9d3731 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -988,6 +988,9 @@
           }
         }
 
+        /* mark the string as not yet converted */
+        entry->string = NULL;
+
         entry++;
       }