diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-10 15:49:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-10 15:49:48 +0100 |
| commit | d783adea42f29bd7917929597ca1031b70587e1d (patch) | |
| tree | 888ffc3043e659513c1760fdb7bd531810723afa /freetype/src/base/ftbitmap.c | |
| parent | ba1993a2eefbd475b13f373a861a401f06584cf8 (diff) | |
| download | vcxsrv-d783adea42f29bd7917929597ca1031b70587e1d.tar.gz vcxsrv-d783adea42f29bd7917929597ca1031b70587e1d.tar.bz2 vcxsrv-d783adea42f29bd7917929597ca1031b70587e1d.zip | |
Updated to freetype 2.4.7
Diffstat (limited to 'freetype/src/base/ftbitmap.c')
| -rw-r--r-- | freetype/src/base/ftbitmap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/freetype/src/base/ftbitmap.c b/freetype/src/base/ftbitmap.c index 22ec33752..5ef7ac760 100644 --- a/freetype/src/base/ftbitmap.c +++ b/freetype/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 ) ) |