From fd2b16f01fa0444eea1e4a13cceae319b6a8d7a3 Mon Sep 17 00:00:00 2001 From: Parth Wazurkar Date: Fri, 10 Aug 2018 18:11:10 +0530 Subject: [tfm] Resolve memory leak errors. * src/tfm/tfmobjs.c(tfm_close): Remove double freeing of `stream' object. * src/gf/gfdrivr.c(TFM_Read_Metrics): Fix oversight errors. --- src/gf/gfdrivr.c | 1 - src/tfm/tfmobjs.c | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/gf/gfdrivr.c b/src/gf/gfdrivr.c index acd7f40d2..df78f7686 100644 --- a/src/gf/gfdrivr.c +++ b/src/gf/gfdrivr.c @@ -523,7 +523,6 @@ */ face->tfm_data = fi; - fi = NULL; } Exit: diff --git a/src/tfm/tfmobjs.c b/src/tfm/tfmobjs.c index 8cd3b5bf5..7e4ec55e9 100644 --- a/src/tfm/tfmobjs.c +++ b/src/tfm/tfmobjs.c @@ -131,9 +131,9 @@ FT_LOCAL( void ) tfm_close( TFM_Parser parser ) { - FT_Memory memory = parser->memory; + FT_UNUSED( parser ); - FT_FREE( parser->stream ); + /* nothing */ } @@ -346,13 +346,10 @@ fi->slant = (FT_ULong)((double)fi->slant/(double)(1<<20)); Exit: - if( !ci || !w || !h || !d ) - { - FT_FREE(ci); - FT_FREE(w); - FT_FREE(h); - FT_FREE(d); - } + FT_FREE(ci); + FT_FREE(w); + FT_FREE(h); + FT_FREE(d); return error; } -- cgit v1.2.1