summaryrefslogtreecommitdiffstats
path: root/src/base/ftbitmap.c
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2011-12-16 12:43:20 -0800
committerGeremy Condra <gcondra@google.com>2011-12-16 12:43:20 -0800
commit27811904d8de0ce5591417812ca31163bf5aad60 (patch)
treecb03f6111bcf07f311be09b462bbe1d7391a689f /src/base/ftbitmap.c
parenta56904260208e9306d661349cc2bddfad8f29019 (diff)
downloadandroid_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.zip
android_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.tar.gz
android_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.tar.bz2
Updated freetype to 2.4.8
This change is to fix a vulnerability in 2.4.7 (CVE-2011-3439). It is taken from http://b/issue?id=5700584. Change-Id: I25a87999bc3ab44d7c7f59e7f04f56895d86bb5d
Diffstat (limited to 'src/base/ftbitmap.c')
-rw-r--r--src/base/ftbitmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 5ef7ac7..15c9d65 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -417,8 +417,8 @@
target->pitch = source->width + pad;
- if ( target->pitch > 0 &&
- target->rows > FT_ULONG_MAX / target->pitch )
+ if ( target->pitch > 0 &&
+ (FT_ULong)target->rows > FT_ULONG_MAX / target->pitch )
return FT_Err_Invalid_Argument;
if ( target->rows * target->pitch > old_size &&