* 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.

ChangeLog

@@ -1,3 +1,12 @@
+2008-10-01  Werner Lemberg  <wl@gnu.org>
+
+	* 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.
+
 2008-09-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* src/base/rules.mk: Add conditional source to BASE_SRC, for `make

src/bdf/bdfdrivr.c

@@ -305,9 +305,14 @@ THE SOFTWARE.
   BDF_Face_Done( FT_Face  bdfface )         /* BDF_Face */
   {
     BDF_Face   face = (BDF_Face)bdfface;
-    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_Memory  memory;
 
 
+    if ( !face )
+      return;
+
+    memory = FT_FACE_MEMORY( face );
+
     bdf_free_font( face->bdffont );
 
     FT_FREE( face->en_table );

src/cff/cffobjs.c

@@ -920,10 +920,16 @@
   cff_face_done( FT_Face  cffface )         /* CFF_Face */
   {
     CFF_Face      face = (CFF_Face)cffface;
-    FT_Memory     memory = cffface->memory;
+    FT_Memory     memory;
-    SFNT_Service  sfnt   = (SFNT_Service)face->sfnt;
+    SFNT_Service  sfnt;
 
 
+    if ( !face )
+      return;
+
+    memory = cffface->memory;
+    sfnt   = (SFNT_Service)face->sfnt;
+
     if ( sfnt )
       sfnt->done_face( face );
 

src/cid/cidobjs.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID objects manager (body).                                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008 by             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -195,14 +195,15 @@
   {
     CID_Face      face = (CID_Face)cidface;
     FT_Memory     memory;
+    CID_FaceInfo  cid;
+    PS_FontInfo   info;
 
 
-    if ( face )
+    if ( !face )
-    {
+      return;
-      CID_FaceInfo  cid  = &face->cid;
-      PS_FontInfo   info = &cid->font_info;
-
 
+    cid    = &face->cid;
+    info   = &cid->font_info;
     memory = cidface->memory;
 
     /* release subrs */
@@ -248,7 +249,6 @@
     FT_FREE( face->binary_data );
     FT_FREE( face->cid_stream );
   }
-  }
 
 
   /*************************************************************************/

src/pcf/pcfdrivr.c

@@ -197,9 +197,14 @@ THE SOFTWARE.
   PCF_Face_Done( FT_Face  pcfface )         /* PCF_Face */
   {
     PCF_Face   face = (PCF_Face)pcfface;
-    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_Memory  memory;
 
 
+    if ( !face )
+      return;
+
+    memory = FT_FACE_MEMORY( face );
+
     FT_FREE( face->encodings );
     FT_FREE( face->metrics );
 

src/pfr/pfrobjs.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR object methods (body).                                  */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2005, 2006, 2007 by                        */
+/*  Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 by                  */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -42,9 +42,14 @@
   pfr_face_done( FT_Face  pfrface )     /* PFR_Face */
   {
     PFR_Face   face = (PFR_Face)pfrface;
-    FT_Memory  memory = pfrface->driver->root.memory;
+    FT_Memory  memory;
 
 
+    if ( !face )
+      return;
+
+    memory = pfrface->driver->root.memory;
+
     /* we don't want dangling pointers */
     pfrface->family_name = NULL;
     pfrface->style_name  = NULL;

src/sfnt/sfobjs.c

@@ -1027,10 +1027,16 @@
   FT_LOCAL_DEF( void )
   sfnt_done_face( TT_Face  face )
   {
-    FT_Memory     memory = face->root.memory;
+    FT_Memory     memory;
-    SFNT_Service  sfnt   = (SFNT_Service)face->sfnt;
+    SFNT_Service  sfnt;
 
 
+    if ( !face )
+      return;
+
+    memory = face->root.memory;
+    sfnt   = (SFNT_Service)face->sfnt;
+
     if ( sfnt )
     {
       /* destroy the postscript names table if it is loaded */

src/truetype/ttobjs.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Objects manager (body).                                              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by             */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by       */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -331,11 +331,17 @@
   tt_face_done( FT_Face  ttface )           /* TT_Face */
   {
     TT_Face       face = (TT_Face)ttface;
-    FT_Memory     memory = face->root.memory;
+    FT_Memory     memory;
-    FT_Stream     stream = face->root.stream;
+    FT_Stream     stream;
+    SFNT_Service  sfnt;
 
-    SFNT_Service  sfnt   = (SFNT_Service)face->sfnt;
 
+    if ( !face )
+      return;
+
+    memory = face->root.memory;
+    stream = face->root.stream;
+    sfnt   = (SFNT_Service)face->sfnt;
 
     /* for `extended TrueType formats' (i.e. compressed versions) */
     if ( face->extra.finalizer )

src/type1/t1objs.c

@@ -191,12 +191,16 @@
   FT_LOCAL_DEF( void )
   T1_Face_Done( T1_Face  face )
   {
-    if ( face )
+    FT_Memory  memory;
-    {
+    T1_Font    type1;
-      FT_Memory  memory = face->root.memory;
-      T1_Font    type1  = &face->type1;
 
 
+    if ( !face )
+      return;
+
+    memory = face->root.memory;
+    type1  = &face->type1;
+
 #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
     /* release multiple masters information */
     FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
@@ -257,7 +261,6 @@
     face->root.family_name = NULL;
     face->root.style_name  = NULL;
   }
-  }
 
 
   /*************************************************************************/

src/type42/t42objs.c

@@ -392,8 +392,9 @@
     FT_Memory    memory;
 
 
-    if ( face )
+    if ( !face )
-    {
+      return;
+
     type1  = &face->type1;
     info   = &type1->font_info;
     memory = face->root.memory;
@@ -436,7 +437,6 @@
     face->root.family_name = 0;
     face->root.style_name  = 0;
   }
-  }
 
 
   /*************************************************************************/

src/winfonts/winfnt.c

@@ -665,17 +665,19 @@
   static void
   FNT_Face_Done( FNT_Face  face )
   {
-    if ( face )
+    FT_Memory  memory;
-    {
-      FT_Memory  memory = FT_FACE_MEMORY( face );
 
 
+    if ( !face )
+      return;
+
+    memory = FT_FACE_MEMORY( face );
+
     fnt_font_done( face );
 
     FT_FREE( face->root.available_sizes );
     face->root.num_fixed_sizes = 0;
   }
-  }
 
 
   static FT_Error