* src/cid/cidobjs.c (CID_Face_Done): fixed a memory leak, the subrs

        routines were never released when CID faces were destroyed

2 files changed, 20 insertions, 1 deletions

diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index ad3901391..561129198 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -446,7 +446,7 @@
 
       if ( FILE_Seek( cid->data_offset + offsets[0] ) ||
            FILE_Read( subr->code[0], data_len )  )
-        goto Exit;
+        goto Fail;
 
       /* set up pointers */
       for ( count = 1; count <= num_subrs; count++ )
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index e2eb67954..2d1e6b302 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -196,6 +196,25 @@
 
       memory = face->root.memory;
 
+      /* release subrs */
+      if ( face->subrs )
+      {
+        FT_Int      n;
+        
+        for ( n = 0; n < cid->num_dicts; n++ )
+        {
+          CID_Subrs*  subr = face->subrs + n;
+          
+          if ( subr->code )
+          {
+            FREE( subr->code[0] );
+            FREE( subr->code );
+          }
+        }
+
+        FREE( face->subrs );
+      }
+
       /* release FontInfo strings */
       FREE( info->version );
       FREE( info->notice );