diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
| commit | 4284aeba874b9168f2228c59639bec8346a56796 (patch) | |
| tree | d51ffb4507e0cae24b0875d8bb6b2c037829a684 /freetype/src/base/ftgloadr.c | |
| parent | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (diff) | |
| parent | 0695dfb71ca6fe132d15a4d0890e8a868183adf9 (diff) | |
| download | vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.gz vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.bz2 vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.zip | |
svn merge ^/branches/released
Diffstat (limited to 'freetype/src/base/ftgloadr.c')
| -rw-r--r-- | freetype/src/base/ftgloadr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/freetype/src/base/ftgloadr.c b/freetype/src/base/ftgloadr.c index e1a19af2b..95dacc37f 100644 --- a/freetype/src/base/ftgloadr.c +++ b/freetype/src/base/ftgloadr.c @@ -218,6 +218,9 @@ { new_max = FT_PAD_CEIL( new_max, 8 ); + if ( new_max > FT_OUTLINE_POINTS_MAX ) + return FT_Err_Array_Too_Large; + if ( FT_RENEW_ARRAY( base->points, old_max, new_max ) || FT_RENEW_ARRAY( base->tags, old_max, new_max ) ) goto Exit; @@ -246,6 +249,10 @@ if ( new_max > old_max ) { new_max = FT_PAD_CEIL( new_max, 4 ); + + if ( new_max > FT_OUTLINE_CONTOURS_MAX ) + return FT_Err_Array_Too_Large; + if ( FT_RENEW_ARRAY( base->contours, old_max, new_max ) ) goto Exit; |