shithub: freetype+ttf2subf

Download patch

ref: abc44f5ecff10cbbaa89bf873eea3ecfd1e88ee2
parent: 23a424f521570239f666e83289a90f05416a9cab
author: Werner Lemberg <[email protected]>
date: Sat Aug 18 02:38:07 EDT 2007

* 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.

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-18  Werner Lemberg  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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-- )
     {