summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2020-06-19 16:21:08 +0800
committerWerner Lemberg <wl@gnu.org>2020-06-19 18:49:36 +0200
commit09b98060d3e0edfe78ea88ca8b851751a924ecac (patch)
tree34723dc13035564bb7c7beb9921c76cda8de2d9a
parent6e722f2eaa5840e6b8c6f1eaa6a1fce9d7f90833 (diff)
downloadfreetype2-09b98060d3e0edfe78ea88ca8b851751a924ecac.tar.gz
Fix memory leak (#58624).
* src/base/ftobjs.c (FT_New_Size): Avoid trying to free `size->internal`, unless `size' has been allocated. This mistake appeared in the fix for 58611.
-rw-r--r--ChangeLog8
-rw-r--r--src/base/ftobjs.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87bb49154..b380a72ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-19 Sebastian Rasmussen <sebras@gmail.com>
+
+ [base] Fix memory leak (#58624).
+
+ * src/base/ftobjs.c (FT_New_Size): Avoid trying to free
+ `size->internal' unless `size' has been allocated. This mistake
+ appeared in the fix for issue #58611.
+
2020-06-19 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Rework d1180b5f9598 until further notice.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 2b4e6bb8e..78164c8cb 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2857,7 +2857,8 @@
if ( error )
{
FT_FREE( node );
- FT_FREE( size->internal );
+ if ( size )
+ FT_FREE( size->internal );
FT_FREE( size );
}