From fe0a7d9df5b45430b6a36627c857f0393c77fbb5 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 13 Jul 2017 10:25:42 +0200 Subject: [PATCH] [base] Fix memory leak. Reported as https://bugs.chromium.org/p/chromium/issues/detail?id=738362 * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case of error. --- ChangeLog | 11 +++++++++++ src/base/ftglyph.c | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9bc844f4..56168da4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2017-07-13 Werner Lemberg + + [base] Fix memory leak. + + Reported as + + https://bugs.chromium.org/p/chromium/issues/detail?id=738362 + + * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case + of error. + 2017-07-12 Werner Lemberg [base] Integer overflow. diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 62d94cbd3..3f78a8c36 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -412,13 +412,15 @@ slot->advance.x <= -0x8000L * 64 ) { FT_ERROR(( "FT_Get_Glyph: advance width too large\n" )); - return FT_THROW( Invalid_Argument ); + error = FT_THROW( Invalid_Argument ); + goto Exit2; } if ( slot->advance.y >= 0x8000L * 64 || slot->advance.y <= -0x8000L * 64 ) { FT_ERROR(( "FT_Get_Glyph: advance height too large\n" )); - return FT_THROW( Invalid_Argument ); + error = FT_THROW( Invalid_Argument ); + goto Exit2; } glyph->advance.x = slot->advance.x * 1024; @@ -427,6 +429,7 @@ /* now import the image from the glyph slot */ error = clazz->glyph_init( glyph, slot ); + Exit2: /* if an error occurred, destroy the glyph */ if ( error ) FT_Done_Glyph( glyph );