diff options
| author | Werner Lemberg <wl@gnu.org> | 2010-10-12 07:49:17 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2010-10-12 07:49:17 +0200 |
| commit | 59eb9f8cfe7d1df379a2318316d1f04f80fba54a (patch) | |
| tree | 74ee2623e743082add12ed10036e1533428a572e | |
| parent | bc4ed48e4133dbdc04a542266723403b019dc9e1 (diff) | |
| download | freetype2-59eb9f8cfe7d1df379a2318316d1f04f80fba54a.tar.gz | |
Fix Savannah bug #31310.
* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against
invalid `runcnt' values.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/truetype/ttgxvar.c | 6 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2010-10-12 Werner Lemberg <wl@gnu.org> + + Fix Savannah bug #31310. + + * src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against + invalid `runcnt' values. + 2010-10-08 Chris Liddell <chris.liddell@artifex.com> Fix Savannah bug #31275. diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 653d9d5cf..47bb9fcca 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -130,7 +130,7 @@ FT_Int j; FT_Int first; FT_Memory memory = stream->memory; - FT_Error error = TT_Err_Ok; + FT_Error error = TT_Err_Ok; FT_UNUSED( error ); @@ -154,7 +154,7 @@ runcnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK; first = points[i++] = FT_GET_USHORT(); - if ( runcnt < 1 ) + if ( runcnt < 1 || i + runcnt >= n ) goto Exit; /* first point not included in runcount */ @@ -165,7 +165,7 @@ { first = points[i++] = FT_GET_BYTE(); - if ( runcnt < 1 ) + if ( runcnt < 1 || i + runcnt >= n ) goto Exit; for ( j = 0; j < runcnt; ++j ) |