diff options
author | marha <marha@users.sourceforge.net> | 2010-08-06 10:14:25 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-08-06 10:14:25 +0000 |
commit | 47ed6413ce8f2586b8d542dc46055e075a47022e (patch) | |
tree | b814efb2655c444a4f63ac3cbb7d0cdf4bb3ef2f /freetype/src/psaux/psobjs.c | |
parent | c115795736eb99a8f2288a06c231b9386f4d011f (diff) | |
download | vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.gz vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.bz2 vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.zip |
Updated to freetype 2.4.1
Diffstat (limited to 'freetype/src/psaux/psobjs.c')
-rw-r--r-- | freetype/src/psaux/psobjs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/freetype/src/psaux/psobjs.c b/freetype/src/psaux/psobjs.c index fe8398ae3..45c741914 100644 --- a/freetype/src/psaux/psobjs.c +++ b/freetype/src/psaux/psobjs.c @@ -4,7 +4,8 @@ /* */ /* Auxiliary functions for PostScript fonts (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ +/* 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1588,6 +1589,13 @@ FT_Error error; + /* this might happen in invalid fonts */ + if ( !outline ) + { + FT_ERROR(( "t1_builder_add_contour: no outline to add points to\n" )); + return PSaux_Err_Invalid_File_Format; + } + if ( !builder->load_points ) { outline->n_contours++; @@ -1621,7 +1629,7 @@ if ( builder->parse_state == T1_Parse_Have_Path ) error = PSaux_Err_Ok; - else if ( builder->parse_state == T1_Parse_Have_Moveto ) + else { builder->parse_state = T1_Parse_Have_Path; error = t1_builder_add_contour( builder ); |