diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-03-03 14:24:57 -0800 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-03-03 15:33:53 -0800 |
| commit | 295ffce55e0198e7a9f7d46b33f5c2b4147bf821 (patch) | |
| tree | bda1a337e630483e46b2e4d4db803814437b765d /src/base/ftbitmap.c | |
| parent | 6fb02c1f75ab969890012dd1f01939d3444ddbc1 (diff) | |
| download | android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.gz android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.bz2 android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.zip | |
Update to FreeType 2.3.12
Diffstat (limited to 'src/base/ftbitmap.c')
| -rw-r--r-- | src/base/ftbitmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 8810cfa..46fcce6 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -228,8 +228,12 @@ if ( !bitmap || !bitmap->buffer ) return FT_Err_Invalid_Argument; - xstr = FT_PIX_ROUND( xStrength ) >> 6; - ystr = FT_PIX_ROUND( yStrength ) >> 6; + if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) || + ( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) ) + return FT_Err_Invalid_Argument; + + xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6; + ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6; if ( xstr == 0 && ystr == 0 ) return FT_Err_Ok; |