freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 2e2f3cb: [psaux] Fix memory leak (#58626).


From: Werner LEMBERG
Subject: [freetype2] master 2e2f3cb: [psaux] Fix memory leak (#58626).
Date: Fri, 19 Jun 2020 12:52:48 -0400 (EDT)

branch: master
commit 2e2f3cb5baf1aed20c4eda08e043a2cf2515f275
Author: Sebastian Rasmussen <sebras@gmail.com>
Commit: Werner Lemberg <wl@gnu.org>

    [psaux] Fix memory leak (#58626).
    
    * src/psaux/psstack.c (cf2_stack_init): If `cf2_stack_init' fails to
    allocate the stack, return error early.
---
 ChangeLog           |  7 +++++++
 src/psaux/psstack.c | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b380a72..19967d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-06-19  Sebastian Rasmussen  <sebras@gmail.com>
 
+       [psaux] Fix memory leak (#58626).
+
+       * src/psaux/psstack.c (cf2_stack_init): If `cf2_stack_init' fails to
+       allocate the stack, return error early.
+
+2020-06-19  Sebastian Rasmussen  <sebras@gmail.com>
+
        [base] Fix memory leak (#58624).
 
        * src/base/ftobjs.c (FT_New_Size): Avoid trying to free
diff --git a/src/psaux/psstack.c b/src/psaux/psstack.c
index bebbba2..7ae5256 100644
--- a/src/psaux/psstack.c
+++ b/src/psaux/psstack.c
@@ -59,12 +59,12 @@
     CF2_Stack  stack = NULL;
 
 
-    if ( !FT_NEW( stack ) )
-    {
-      /* initialize the structure; FT_NEW zeroes it */
-      stack->memory = memory;
-      stack->error  = e;
-    }
+    if ( FT_NEW( stack ) )
+      return NULL;
+
+    /* initialize the structure; FT_NEW zeroes it */
+    stack->memory = memory;
+    stack->error  = e;
 
     /* allocate the stack buffer */
     if ( FT_NEW_ARRAY( stack->buffer, stackSize ) )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]