[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master fb550bf: * src/pfr/pfrload.c (pfr_aux_name_load): Thi
From: |
Werner LEMBERG |
Subject: |
[freetype2] master fb550bf: * src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567). |
Date: |
Wed, 30 Mar 2016 17:08:06 +0000 |
branch: master
commit fb550bf4666586eedf840f7331c4796ad0739f1d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).
---
ChangeLog | 4 ++++
src/pfr/pfrload.c | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b1cbd69..b1a1bd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2016-03-30 Werner Lemberg <address@hidden>
+ * src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).
+
+2016-03-30 Werner Lemberg <address@hidden>
+
* src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate.
2016-03-30 Werner Lemberg <address@hidden>
diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c
index 989dd05..89ed204 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master fb550bf: * src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567).,
Werner LEMBERG <=