diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
| commit | 20ff8ddf2d9bb41050d10bbc75d61b9161880c7c (patch) | |
| tree | 22566fcd9663b2baa565cd0c64eaa662d6ba03ee /freetype/src/base/ftgxval.c | |
| parent | c29011f2831315d3da9c4727c1e626d80520b97a (diff) | |
| parent | 6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff) | |
| download | vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.gz vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.bz2 vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/base/ftgxval.c')
| -rw-r--r-- | freetype/src/base/ftgxval.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/freetype/src/base/ftgxval.c b/freetype/src/base/ftgxval.c index d0dcbc11f..528b5eab7 100644 --- a/freetype/src/base/ftgxval.c +++ b/freetype/src/base/ftgxval.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for validating TrueTyepGX/AAT tables (body). */ /* */ -/* Copyright 2004, 2005, 2006 by */ +/* Copyright 2004, 2005, 2006, 2010 by */ /* Masatake YAMATO, Redhat K.K, */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -73,9 +73,14 @@ FT_TrueTypeGX_Free( FT_Face face, FT_Bytes table ) { - FT_Memory memory = FT_FACE_MEMORY( face ); + FT_Memory memory; + if ( !face ) + return; + + memory = FT_FACE_MEMORY( face ); + FT_FREE( table ); } @@ -119,7 +124,13 @@ FT_ClassicKern_Free( FT_Face face, FT_Bytes table ) { - FT_Memory memory = FT_FACE_MEMORY( face ); + FT_Memory memory; + + + if ( !face ) + return; + + memory = FT_FACE_MEMORY( face ); FT_FREE( table ); |