summaryrefslogtreecommitdiff
path: root/src/winfonts/winfnt.c
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2008-10-01 22:39:05 +0000
committerWerner Lemberg <wl@gnu.org>2008-10-01 22:39:05 +0000
commitd03d856d959271920f9468198153c54d552d1847 (patch)
tree962f41b817c96e021e6bc68bbe9d0622c88fdbbf /src/winfonts/winfnt.c
parent6bc16e92e414f5a4368d10973294e44d70e7c588 (diff)
downloadfreetype2-d03d856d959271920f9468198153c54d552d1847.tar.gz
* 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.
Diffstat (limited to 'src/winfonts/winfnt.c')
-rw-r--r--src/winfonts/winfnt.c16
1 files changed, 9 insertions, 7 deletions
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;
}