shithub: freetype+ttf2subf

Download patch

ref: fb550bf4666586eedf840f7331c4796ad0739f1d
parent: aff6ebb9a6e9b8cfdf47dcb0fe1b36396241a052
author: Werner Lemberg <[email protected]>
date: Wed Mar 30 14:55:27 EDT 2016 

* src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-03-30  Werner Lemberg  <[email protected]>
 
+	* src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).
+
+2016-03-30  Werner Lemberg  <[email protected]>
+
 	* src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate.
 
 2016-03-30  Werner Lemberg  <[email protected]>
--- a/src/pfr/pfrload.c
+++ b/src/pfr/pfrload.c
@@ -743,6 +743,9 @@
     FT_UInt     n, ok;
 
 
+    if ( *astring )
+      FT_FREE( *astring );
+
     if ( len > 0 && p[len - 1] == 0 )
       len--;
 
@@ -758,9 +761,6 @@
 
     if ( ok )
     {
-      if ( *astring )
-        FT_FREE( *astring );
-
       if ( FT_ALLOC( result, len + 1 ) )
         goto Exit;
 
@@ -767,6 +767,7 @@
       FT_MEM_COPY( result, p, len );
       result[len] = 0;
     }
+
   Exit:
     *astring = result;
     return error;