From d03d856d959271920f9468198153c54d552d1847 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 1 Oct 2008 22:39:05 +0000 Subject: * src/truetype/ttobjs.c (tt_face_done), src/cff/cffobjs.c (cff_face_done), src/pfr/pfrobjs.c (pfr_face_done), src/pcf/pcfdrivr.c (PCF_Face_Done), src/cid/cidobjs.c (cid_face_done), src/bdf/bdfdrivr. (BDF_Face_Done), src/sfnt/sfobjs.c (sfnt_face_done): Protect against face == 0. Reported by Graham Asher. --- src/winfonts/winfnt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/winfonts/winfnt.c') diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 833fb888a..65055ac0a 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -665,16 +665,18 @@ static void FNT_Face_Done( FNT_Face face ) { - if ( face ) - { - FT_Memory memory = FT_FACE_MEMORY( face ); + FT_Memory memory; - fnt_font_done( face ); + if ( !face ) + return; - FT_FREE( face->root.available_sizes ); - face->root.num_fixed_sizes = 0; - } + memory = FT_FACE_MEMORY( face ); + + fnt_font_done( face ); + + FT_FREE( face->root.available_sizes ); + face->root.num_fixed_sizes = 0; } -- cgit v1.2.1