diff --git a/ChangeLog b/ChangeLog index b1cbd69c7..b1a1bd44b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-03-30 Werner Lemberg + + * src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567). + 2016-03-30 Werner Lemberg * src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate. diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c index 989dd05ce..89ed204e2 100644 --- 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;