diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-18 15:38:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-18 15:38:32 +0100 |
| commit | ac36cb2c0db123b18d83f59d011d83b299edea63 (patch) | |
| tree | c513e767ebfb36c8439b87eec7853198cc0387af /freetype/src/base/ftbitmap.c | |
| parent | 7a750103eafc49dd7ee461b6f5efb41a93174056 (diff) | |
| parent | 1037d56ca89d503cfd62830a90e934a2806ad804 (diff) | |
| download | vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.tar.gz vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.tar.bz2 vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'freetype/src/base/ftbitmap.c')
| -rw-r--r-- | freetype/src/base/ftbitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/freetype/src/base/ftbitmap.c b/freetype/src/base/ftbitmap.c index 5e1ab1a97..1f2ada0e4 100644 --- a/freetype/src/base/ftbitmap.c +++ b/freetype/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 && |