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/base/ftbitmap.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/base/ftbitmap.c')
| -rw-r--r-- | src/base/ftbitmap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 22ec337..5ef7ac7 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility functions for bitmaps (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 2004-2009, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -417,6 +417,10 @@ target->pitch = source->width + pad; + if ( target->pitch > 0 && + target->rows > FT_ULONG_MAX / target->pitch ) + return FT_Err_Invalid_Argument; + if ( target->rows * target->pitch > old_size && FT_QREALLOC( target->buffer, old_size, target->rows * target->pitch ) ) |