diff options
| author | Geremy Condra <gcondra@google.com> | 2011-11-17 14:08:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 14:08:04 -0800 |
| commit | a56904260208e9306d661349cc2bddfad8f29019 (patch) | |
| tree | 720489aa1d9176e568acf0f8cb441a3f8cb0663f /src/raster/ftrend1.c | |
| parent | ec53de77a7ec24f862372a39333f8e91708a806d (diff) | |
| parent | bff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc (diff) | |
| download | android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.gz android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.bz2 android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.zip | |
Merge "DO NOT MERGE Update FreeType library to 2.4.7"
Diffstat (limited to 'src/raster/ftrend1.c')
| -rw-r--r-- | src/raster/ftrend1.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index d8a89f2..28b1b58 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2005, 2006 by */ +/* Copyright 1996-2003, 2005, 2006, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -176,6 +176,13 @@ width = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 ); height = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 ); + + if ( width > FT_USHORT_MAX || height > FT_USHORT_MAX ) + { + error = Raster_Err_Invalid_Argument; + goto Exit; + } + bitmap = &slot->bitmap; memory = render->root.memory; |