From 23a424f521570239f666e83289a90f05416a9cab Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 17 Aug 2007 20:16:44 +0000
Subject: [PATCH] * src/otvalid/otvgsub.c (otv_SingleSubst_validate): Fix
 handling of SingleSubstFormat1.

---
 ChangeLog             |  5 +++++
 src/otvalid/otvgsub.c | 12 ++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b464f33bd..328a7be21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-17  George Williams  <gww@silcom.com>
+
+	* src/otvalid/otvgsub.c (otv_SingleSubst_validate): Fix handling of
+	SingleSubstFormat1.
+
 2007-08-11  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* builds/unix/configure.raw: Fix a bug which sets CC_BUILD by
diff --git a/src/otvalid/otvgsub.c b/src/otvalid/otvgsub.c
index 3b0fe2587..f01fca1e8 100644
--- a/src/otvalid/otvgsub.c
+++ b/src/otvalid/otvgsub.c
@@ -71,16 +71,12 @@
         otv_Coverage_validate( Coverage, valid, -1 );
 
         idx = otv_Coverage_get_first( Coverage ) + DeltaGlyphID;
-        if ( idx < 0                                           ||
-             idx + DeltaGlyphID < 0                            ||
-             (FT_UInt)idx + DeltaGlyphID >= valid->glyph_count )
-          FT_INVALID_GLYPH_ID;
+        if ( idx < 0 )
+          FT_INVALID_DATA;
 
         idx = otv_Coverage_get_last( Coverage ) + DeltaGlyphID;
-        if ( (FT_UInt)idx >= valid->glyph_count                ||
-             idx + DeltaGlyphID < 0                            ||
-             (FT_UInt)idx + DeltaGlyphID >= valid->glyph_count )
-          FT_INVALID_GLYPH_ID;
+        if ( (FT_UInt)idx >= valid->glyph_count )
+          FT_INVALID_DATA;
       }
       break;