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

9 years ago · fb550bf466
parent aff6ebb9a6
commit fb550bf466
2 changed files with 8 additions and 3 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2016-03-30  Werner Lemberg  <wl@gnu.org>
+
+	* src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).
+
 2016-03-30  Werner Lemberg  <wl@gnu.org>

 	* src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate.
--- 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,15 +761,13 @@

    if ( ok )
    {
-      if ( *astring )
-        FT_FREE( *astring );
-
      if ( FT_ALLOC( result, len + 1 ) )
        goto Exit;

      FT_MEM_COPY( result, p, len );
      result[len] = 0;
    }
+
  Exit:
    *astring = result;
    return error;