commit b110acba9e6f7e40314f0da5d249cb3cb3beeab8
author Werner Lemberg <wl@gnu.org> Fri Jul 12 11:36:12 2019 +0200
committer Werner Lemberg <wl@gnu.org> Fri Jul 12 11:36:12 2019 +0200
tree 2dd16af59ef1dd2888f2c63c954787583402b3ef
parent 12e4307dc7b48c9a4a4fc3ac6c32220874ab18ec

[sfnt, winfonts] Avoid memory leaks in case of error (#56587).

* src/sfnt/sfwoff.c (woff_open_font): Call `FT_FRAME_EXIT' in case
of error.

* src/winfonts/winfnt.c (fnt_face_get_dll_font): Ditto.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 27b4c0d..dfafdfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-07-12  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt, winfonts] Avoid memory leaks in case of error (#56587).
+
+	* src/sfnt/sfwoff.c (woff_open_font): Call `FT_FRAME_EXIT' in case
+	of error.
+
+	* src/winfonts/winfnt.c (fnt_face_get_dll_font): Ditto.
+
 2019-07-12  Ben Wagner  <bungeman@google.com>
 
 	Properly handle phantom points for variation fonts (#56601).

src/sfnt/sfwoff.c

diff --git a/src/sfnt/sfwoff.c b/src/sfnt/sfwoff.c
index ca4821a..c7eaca1 100644
--- a/src/sfnt/sfwoff.c
+++ b/src/sfnt/sfwoff.c
@@ -371,18 +371,18 @@
                                     sfnt + table->OrigOffset, &output_len,
                                     stream->cursor, table->CompLength );
         if ( error )
-          goto Exit;
+          goto Exit1;
         if ( output_len != table->OrigLength )
         {
           FT_ERROR(( "woff_font_open: compressed table length mismatch\n" ));
           error = FT_THROW( Invalid_Table );
-          goto Exit;
+          goto Exit1;
         }
 
 #else /* !FT_CONFIG_OPTION_USE_ZLIB */
 
         error = FT_THROW( Unimplemented_Feature );
-        goto Exit;
+        goto Exit1;
 
 #endif /* !FT_CONFIG_OPTION_USE_ZLIB */
       }
@@ -424,6 +424,10 @@
     }
 
     return error;
+
+  Exit1:
+    FT_FRAME_EXIT();
+    goto Exit;
   }
 
 

src/winfonts/winfnt.c

diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 2d771be..97eb6fc 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -331,7 +331,7 @@
         {
           FT_TRACE2(( "invalid alignment shift count for resource data\n" ));
           error = FT_THROW( Invalid_File_Format );
-          goto Exit;
+          goto Exit1;
         }
 
 
@@ -597,6 +597,10 @@
 
   Exit:
     return error;
+
+  Exit1:
+    FT_FRAME_EXIT();
+    goto Exit;
   }