diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
| commit | 9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch) | |
| tree | 98acb9a60cf237138f939b5dadb0d9ae7722ddeb /src/3rdparty/freetype/src/pfr/pfrobjs.c | |
| parent | e9d32707afeddfdd2906af7bed60c375b1035dd6 (diff) | |
| parent | 3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/freetype/src/pfr/pfrobjs.c')
| -rw-r--r-- | src/3rdparty/freetype/src/pfr/pfrobjs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/3rdparty/freetype/src/pfr/pfrobjs.c b/src/3rdparty/freetype/src/pfr/pfrobjs.c index 180446d73..56d617d88 100644 --- a/src/3rdparty/freetype/src/pfr/pfrobjs.c +++ b/src/3rdparty/freetype/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, */ @@ -41,10 +41,15 @@ FT_LOCAL_DEF( void ) pfr_face_done( FT_Face pfrface ) /* PFR_Face */ { - PFR_Face face = (PFR_Face)pfrface; - FT_Memory memory = pfrface->driver->root.memory; + PFR_Face face = (PFR_Face)pfrface; + 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; |