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/raster | |
| 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/raster')
| -rw-r--r-- | freetype/src/raster/ftrend1.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/freetype/src/raster/ftrend1.c b/freetype/src/raster/ftrend1.c index d8a89f28a..28b1b5897 100644 --- a/freetype/src/raster/ftrend1.c +++ b/freetype/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; |