[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 5327092: [woff2] Fix memory leaks.
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 5327092: [woff2] Fix memory leaks. |
Date: |
Fri, 20 Sep 2019 00:31:13 -0400 (EDT) |
branch: master
commit 5327092bb28b6df742386d75555ba3ccc6d05ce6
Author: Nikhil Ramakrishnan <address@hidden>
Commit: Werner Lemberg <address@hidden>
[woff2] Fix memory leaks.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16896
* src/sfnt/sfwoff2.c (woff2_open_font): Fix error handling.
Free `uncompressed_buf'.
(reconstruct_font): Free `transformed_buf'.
---
ChangeLog | 12 ++++++++++++
src/sfnt/sfwoff2.c | 10 ++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bed5802..3e9cf75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-09-20 Nikhil Ramakrishnan <address@hidden>
+
+ [woff2] Fix memory leaks.
+
+ Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16896
+
+ * src/sfnt/sfwoff2.c (woff2_open_font): Fix error handling.
+ Free `uncompressed_buf'.
+ (reconstruct_font): Free `transformed_buf'.
+
2019-09-17 Werner Lemberg <address@hidden>
* src/otvalid/otvcommon.c (otv_Coverage_get_last): Guard `count'.
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index bea73c3..bb7c981 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -1706,6 +1706,7 @@
FT_FREE( table_entry );
FT_Stream_Close( stream );
FT_FREE( stream );
+ FT_FREE( transformed_buf );
return error;
}
@@ -2170,11 +2171,12 @@
woff2.uncompressed_size,
stream->cursor,
woff2.totalCompressedSize );
- if ( error )
- goto Exit;
FT_FRAME_EXIT();
+ if ( error )
+ goto Exit;
+
error = reconstruct_font( uncompressed_buf,
woff2.uncompressed_size,
indices,
@@ -2183,6 +2185,9 @@
&sfnt,
&sfnt_size,
memory );
+
+ uncompressed_buf = NULL;
+
if ( error )
goto Exit;
@@ -2221,6 +2226,7 @@
Exit:
FT_FREE( tables );
FT_FREE( indices );
+ FT_FREE( uncompressed_buf );
if ( error )
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 5327092: [woff2] Fix memory leaks.,
Werner LEMBERG <=