freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master ccd771c: * src/pfr/pfrload.c (pfr_aux_name_load): Fix


From: Werner LEMBERG
Subject: [freetype2] master ccd771c: * src/pfr/pfrload.c (pfr_aux_name_load): Fix memory leak (#47567).
Date: Wed, 30 Mar 2016 06:44:58 +0000

branch: master
commit ccd771cdf673eb55e7e0461e89568af7b70fb640
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/pfr/pfrload.c (pfr_aux_name_load): Fix memory leak (#47567).
---
 ChangeLog         |    4 ++++
 src/pfr/pfrload.c |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4794fde..520564a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-30  Werner Lemberg  <address@hidden>
+
+       * src/pfr/pfrload.c (pfr_aux_name_load): Fix memory leak (#47567).
+
 2016-03-29  Werner Lemberg  <address@hidden>
 
        * src/base/ftadvance.c (FT_Get_Advances): Fix invalid left shift.
diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c
index 0bee83a..8592045 100644
--- a/src/pfr/pfrload.c
+++ b/src/pfr/pfrload.c
@@ -740,9 +740,8 @@
     if ( len > 0 && p[len - 1] == 0 )
       len--;
 
-    /* check that each character is ASCII for making sure not to
-       load garbage
-     */
+    /* check that each character is ASCII  */
+    /* for making sure not to load garbage */
     ok = ( len > 0 );
     for ( n = 0; n < len; n++ )
       if ( p[n] < 32 || p[n] > 127 )
@@ -753,6 +752,9 @@
 
     if ( ok )
     {
+      if ( *astring )
+        FT_FREE( *astring );
+
       if ( FT_ALLOC( result, len + 1 ) )
         goto Exit;
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]