[vlc-commits] Revert "freetype: fix crash (wrong memory deallocation)"

Erwan Tulou git at videolan.org
Mon Sep 12 19:56:53 CEST 2011


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Mon Sep 12 19:46:59 2011 +0200| [79bfcece06742f4b2dcc91500ccf524750748728] | committer: Erwan Tulou

Revert "freetype: fix crash (wrong memory deallocation)"

This reverts commit 2224fa034a7a205ba9ec810e67e2889a2bca4471.

FT_Done_Glyph seems needed for shadow. More investigation needed to
work out why libfreetype crashes at this FT_Done_Glyph.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=79bfcece06742f4b2dcc91500ccf524750748728
---

 modules/text_renderer/freetype.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 2a294f5..10c8150 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1776,6 +1776,8 @@ static int GetGlyph( filter_t *p_filter,
         FT_Done_Glyph( glyph );
         if( outline )
             FT_Done_Glyph( outline );
+        if( shadow )
+            FT_Done_Glyph( shadow );
         return VLC_EGENERIC;
     }
     FT_Glyph_Get_CBox( glyph, ft_glyph_bbox_pixels, p_glyph_bbox );



More information about the vlc-commits mailing list