[freetype2] master 7643b58: * src/cid/cidgload.c (cid_load_glyph): Fix memory leak.

[Werner LEMBERG]

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

    * src/cid/cidgload.c (cid_load_glyph): Fix memory leak.
    
    Reported by Kostya Serebryany <address@hidden>.
---
 ChangeLog          |    6 ++++++
 src/cid/cidgload.c |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7525c10..09ba4b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-17  Werner Lemberg  <address@hidden>
 
+       * src/cid/cidgload.c (cid_load_glyph): Fix memory leak.
+
+       Reported by Kostya Serebryany <address@hidden>.
+
+2015-10-17  Werner Lemberg  <address@hidden>
+
        [bdf] Prevent memory leak (#46217).
 
        * src/bdf/bdflib.c (_bdf_parse_glyphs) <STARTCHAR>: Check
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 2c0f0ec..1fbf23d 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -167,8 +167,6 @@
                 glyph_length - cs_offset );
     }
 
-    FT_FREE( charstring );
-
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
     /* Incremental fonts can optionally override the metrics. */
@@ -193,6 +191,8 @@
 #endif /* FT_CONFIG_OPTION_INCREMENTAL */
 
   Exit:
+    FT_FREE( charstring );
+
     return error;
   }