* src/otvalid/otvgsub.c (otv_SingleSubst_validate): Fix handling of SingleSubstFormat1.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/ChangeLog b/ChangeLog
index b464f33..328a7be 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 3b0fe25..f01fca1 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;