diff --git a/ChangeLog b/ChangeLog
index 7525c106f..09ba4b2b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-17  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidgload.c (cid_load_glyph): Fix memory leak.
+
+	Reported by Kostya Serebryany <kcc@google.com>.
+
 2015-10-17  Werner Lemberg  <wl@gnu.org>
 
 	[bdf] Prevent memory leak (#46217).
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 2c0f0ec06..1fbf23dcd 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;
   }