rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
Werner Lemberg 2008-10-01 22:39:05 +00:00
parent 6bc16e92e4
commit d03d856d95
11 changed files with 192 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/rules.mk: Add conditional source to BASE_SRC, for `make * src/base/rules.mk: Add conditional source to BASE_SRC, for `make

9
src/bdf/bdfdrivr.c
View File

@ -304,10 +304,15 @@ THE SOFTWARE.
FT_CALLBACK_DEF( void ) FT_CALLBACK_DEF( void )
BDF_Face_Done( FT_Face bdfface ) /* BDF_Face */ BDF_Face_Done( FT_Face bdfface ) /* BDF_Face */
{ {
BDF_Face face = (BDF_Face)bdfface; 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 ); bdf_free_font( face->bdffont );
FT_FREE( face->en_table ); FT_FREE( face->en_table );

12
src/cff/cffobjs.c
View File

@ -919,11 +919,17 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
cff_face_done( FT_Face cffface ) /* CFF_Face */ cff_face_done( FT_Face cffface ) /* CFF_Face */
{ {
CFF_Face face = (CFF_Face)cffface; 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 ) if ( sfnt )
sfnt->done_face( face ); sfnt->done_face( face );

86
src/cid/cidobjs.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* CID objects manager (body). */ /* 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. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -193,61 +193,61 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
cid_face_done( FT_Face cidface ) /* CID_Face */ cid_face_done( FT_Face cidface ) /* CID_Face */
{ {
CID_Face face = (CID_Face)cidface; CID_Face face = (CID_Face)cidface;
FT_Memory memory; FT_Memory memory;
CID_FaceInfo cid;
PS_FontInfo info;
if ( face ) if ( !face )
return;
cid = &face->cid;
info = &cid->font_info;
memory = cidface->memory;
/* release subrs */
if ( face->subrs )
{ {
CID_FaceInfo cid = &face->cid; FT_Int n;
PS_FontInfo info = &cid->font_info;
memory = cidface->memory; for ( n = 0; n < cid->num_dicts; n++ )
/* release subrs */
if ( face->subrs )
{ {
FT_Int n; CID_Subrs subr = face->subrs + n;
for ( n = 0; n < cid->num_dicts; n++ ) if ( subr->code )
{ {
CID_Subrs subr = face->subrs + n; FT_FREE( subr->code[0] );
FT_FREE( subr->code );
if ( subr->code )
{
FT_FREE( subr->code[0] );
FT_FREE( subr->code );
}
} }
FT_FREE( face->subrs );
} }
/* release FontInfo strings */ FT_FREE( face->subrs );
FT_FREE( info->version );
FT_FREE( info->notice );
FT_FREE( info->full_name );
FT_FREE( info->family_name );
FT_FREE( info->weight );
/* release font dictionaries */
FT_FREE( cid->font_dicts );
cid->num_dicts = 0;
/* release other strings */
FT_FREE( cid->cid_font_name );
FT_FREE( cid->registry );
FT_FREE( cid->ordering );
cidface->family_name = 0;
cidface->style_name = 0;
FT_FREE( face->binary_data );
FT_FREE( face->cid_stream );
} }
/* release FontInfo strings */
FT_FREE( info->version );
FT_FREE( info->notice );
FT_FREE( info->full_name );
FT_FREE( info->family_name );
FT_FREE( info->weight );
/* release font dictionaries */
FT_FREE( cid->font_dicts );
cid->num_dicts = 0;
/* release other strings */
FT_FREE( cid->cid_font_name );
FT_FREE( cid->registry );
FT_FREE( cid->ordering );
cidface->family_name = 0;
cidface->style_name = 0;
FT_FREE( face->binary_data );
FT_FREE( face->cid_stream );
} }

9
src/pcf/pcfdrivr.c
View File

@ -196,10 +196,15 @@ THE SOFTWARE.
FT_CALLBACK_DEF( void ) FT_CALLBACK_DEF( void )
PCF_Face_Done( FT_Face pcfface ) /* PCF_Face */ PCF_Face_Done( FT_Face pcfface ) /* PCF_Face */
{ {
PCF_Face face = (PCF_Face)pcfface; 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->encodings );
FT_FREE( face->metrics ); FT_FREE( face->metrics );

11
src/pfr/pfrobjs.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType PFR object methods (body). */ /* 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. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -41,10 +41,15 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
pfr_face_done( FT_Face pfrface ) /* PFR_Face */ pfr_face_done( FT_Face pfrface ) /* PFR_Face */
{ {
PFR_Face face = (PFR_Face)pfrface; 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 */ /* we don't want dangling pointers */
pfrface->family_name = NULL; pfrface->family_name = NULL;
pfrface->style_name = NULL; pfrface->style_name = NULL;

10
src/sfnt/sfobjs.c
View File

@ -1027,10 +1027,16 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
sfnt_done_face( TT_Face face ) 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 ) if ( sfnt )
{ {
/* destroy the postscript names table if it is loaded */ /* destroy the postscript names table if it is loaded */

16
src/truetype/ttobjs.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* Objects manager (body). */ /* 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. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -330,12 +330,18 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
tt_face_done( FT_Face ttface ) /* TT_Face */ tt_face_done( FT_Face ttface ) /* TT_Face */
{ {
TT_Face face = (TT_Face)ttface; 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) */ /* for `extended TrueType formats' (i.e. compressed versions) */
if ( face->extra.finalizer ) if ( face->extra.finalizer )

93
src/type1/t1objs.c
View File

@ -191,72 +191,75 @@
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
T1_Face_Done( T1_Face face ) 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 #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
/* release multiple masters information */ /* release multiple masters information */
FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) ); FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
if ( face->buildchar ) if ( face->buildchar )
{ {
FT_FREE( face->buildchar ); FT_FREE( face->buildchar );
face->buildchar = NULL; face->buildchar = NULL;
face->len_buildchar = 0; face->len_buildchar = 0;
} }
T1_Done_Blend( face ); T1_Done_Blend( face );
face->blend = 0; face->blend = 0;
#endif #endif
/* release font info strings */ /* release font info strings */
{ {
PS_FontInfo info = &type1->font_info; PS_FontInfo info = &type1->font_info;
FT_FREE( info->version ); FT_FREE( info->version );
FT_FREE( info->notice ); FT_FREE( info->notice );
FT_FREE( info->full_name ); FT_FREE( info->full_name );
FT_FREE( info->family_name ); FT_FREE( info->family_name );
FT_FREE( info->weight ); FT_FREE( info->weight );
} }
/* release top dictionary */ /* release top dictionary */
FT_FREE( type1->charstrings_len ); FT_FREE( type1->charstrings_len );
FT_FREE( type1->charstrings ); FT_FREE( type1->charstrings );
FT_FREE( type1->glyph_names ); FT_FREE( type1->glyph_names );
FT_FREE( type1->subrs ); FT_FREE( type1->subrs );
FT_FREE( type1->subrs_len ); FT_FREE( type1->subrs_len );
FT_FREE( type1->subrs_block ); FT_FREE( type1->subrs_block );
FT_FREE( type1->charstrings_block ); FT_FREE( type1->charstrings_block );
FT_FREE( type1->glyph_names_block ); FT_FREE( type1->glyph_names_block );
FT_FREE( type1->encoding.char_index ); FT_FREE( type1->encoding.char_index );
FT_FREE( type1->encoding.char_name ); FT_FREE( type1->encoding.char_name );
FT_FREE( type1->font_name ); FT_FREE( type1->font_name );
#ifndef T1_CONFIG_OPTION_NO_AFM #ifndef T1_CONFIG_OPTION_NO_AFM
/* release afm data if present */ /* release afm data if present */
if ( face->afm_data ) if ( face->afm_data )
T1_Done_Metrics( memory, (AFM_FontInfo)face->afm_data ); T1_Done_Metrics( memory, (AFM_FontInfo)face->afm_data );
#endif #endif
/* release unicode map, if any */ /* release unicode map, if any */
#if 0 #if 0
FT_FREE( face->unicode_map_rec.maps ); FT_FREE( face->unicode_map_rec.maps );
face->unicode_map_rec.num_maps = 0; face->unicode_map_rec.num_maps = 0;
face->unicode_map = NULL; face->unicode_map = NULL;
#endif #endif
face->root.family_name = NULL; face->root.family_name = NULL;
face->root.style_name = NULL; face->root.style_name = NULL;
}
} }

66
src/type42/t42objs.c
View File

@ -392,50 +392,50 @@
FT_Memory memory; FT_Memory memory;
if ( face ) if ( !face )
{ return;
type1 = &face->type1;
info = &type1->font_info;
memory = face->root.memory;
/* delete internal ttf face prior to freeing face->ttf_data */ type1 = &face->type1;
if ( face->ttf_face ) info = &type1->font_info;
FT_Done_Face( face->ttf_face ); memory = face->root.memory;
/* release font info strings */ /* delete internal ttf face prior to freeing face->ttf_data */
FT_FREE( info->version ); if ( face->ttf_face )
FT_FREE( info->notice ); FT_Done_Face( face->ttf_face );
FT_FREE( info->full_name );
FT_FREE( info->family_name );
FT_FREE( info->weight );
/* release top dictionary */ /* release font info strings */
FT_FREE( type1->charstrings_len ); FT_FREE( info->version );
FT_FREE( type1->charstrings ); FT_FREE( info->notice );
FT_FREE( type1->glyph_names ); FT_FREE( info->full_name );
FT_FREE( info->family_name );
FT_FREE( info->weight );
FT_FREE( type1->charstrings_block ); /* release top dictionary */
FT_FREE( type1->glyph_names_block ); FT_FREE( type1->charstrings_len );
FT_FREE( type1->charstrings );
FT_FREE( type1->glyph_names );
FT_FREE( type1->encoding.char_index ); FT_FREE( type1->charstrings_block );
FT_FREE( type1->encoding.char_name ); FT_FREE( type1->glyph_names_block );
FT_FREE( type1->font_name );
FT_FREE( face->ttf_data ); FT_FREE( type1->encoding.char_index );
FT_FREE( type1->encoding.char_name );
FT_FREE( type1->font_name );
FT_FREE( face->ttf_data );
#if 0 #if 0
/* release afm data if present */ /* release afm data if present */
if ( face->afm_data ) if ( face->afm_data )
T1_Done_AFM( memory, (T1_AFM*)face->afm_data ); T1_Done_AFM( memory, (T1_AFM*)face->afm_data );
#endif #endif
/* release unicode map, if any */ /* release unicode map, if any */
FT_FREE( face->unicode_map.maps ); FT_FREE( face->unicode_map.maps );
face->unicode_map.num_maps = 0; face->unicode_map.num_maps = 0;
face->root.family_name = 0; face->root.family_name = 0;
face->root.style_name = 0; face->root.style_name = 0;
}
} }

16
src/winfonts/winfnt.c
View File

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