* src/otvalid/otvcmmn.c (otv_x_y_ux_sy): Skip context glyphs. Found

18 years ago · abc44f5ecf
parent 23a424f521
commit abc44f5ecf
2 changed files with 10 additions and 1 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2007-08-18  Werner Lemberg  <wl@gnu.org>
+
+	* src/otvalid/otvcmmn.c (otv_x_y_ux_sy): Skip context glyphs.  Found
+	by Imran Yousaf.  Fixes Savannah bug #20773.
+
+	(otv_Lookup_validate): Correct handling of LookupType.  Found by
+	Imran Yousaf.  Fixes Savannah bug #20782.
+
 2007-08-17  George Williams  <gww@silcom.com>

 	* src/otvalid/otvgsub.c (otv_SingleSubst_validate): Fix handling of
--- a/src/otvalid/otvcommn.c
+++ b/src/otvalid/otvcommn.c
@ -360,7 +360,7 @@

    OTV_TRACE(( " (type %d)\n", LookupType ));

-    if ( LookupType == 0 || LookupType >= valid->type_count )
+    if ( LookupType == 0 || LookupType > valid->type_count )
      FT_INVALID_DATA;

    validate = valid->type_funcs[LookupType - 1];
@ -759,6 +759,7 @@
      FT_INVALID_DATA;

    OTV_LIMIT_CHECK( ( Count1 - 1 ) * 2 + Count2 * 4 );
+    p += ( Count1 - 1 ) * 2;

    for ( ; Count2 > 0; Count2-- )
    {