summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2009-03-21 10:45:18 +0100
committerWerner Lemberg <wl@gnu.org>2009-03-21 10:45:18 +0100
commitb3e6df69e6d112af739f3ad08cb7cafce32683b2 (patch)
tree20443eab7c3164f793bcd9c8de2d36463e678b88
parent4d1a34ce0bd6ed5657369fbaba3f243b27ff82a7 (diff)
downloadfreetype2-b3e6df69e6d112af739f3ad08cb7cafce32683b2.tar.gz
Really fix Ghostscript Coverity issue #3904.
-rw-r--r--ChangeLog2
-rw-r--r--src/truetype/ttgxvar.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fb6e7ca4e..ed62412ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@
Fix Ghostscript Coverity issue #3904.
* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against
- zero value of `runcnt'.
+ invalid values of `runcnt'.
2009-03-20 Werner Lemberg <wl@gnu.org>
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index cbd401d2b..f6a10d9b7 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -157,7 +157,7 @@
runcnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK;
first = points[i++] = FT_GET_USHORT();
- if ( !runcnt )
+ if ( runcnt < 1 )
goto Exit;
/* first point not included in runcount */
@@ -168,7 +168,7 @@
{
first = points[i++] = FT_GET_BYTE();
- if ( !runcnt )
+ if ( runcnt < 1 )
goto Exit;
for ( j = 0; j < runcnt; ++j )