6578750 fontconfig crash in FcPatternPosition
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 14 Feb 2008 14:07:07 -0800
changeset 313 b2d38ad9d92d
parent 312 51b557f4c86f
child 314 8bc3528cf95c
6578750 fontconfig crash in FcPatternPosition
open-src/lib/fontconfig/fontconfig-2.3.2.patch.hide
--- a/open-src/lib/fontconfig/fontconfig-2.3.2.patch.hide	Mon Feb 11 15:54:15 2008 -0800
+++ b/open-src/lib/fontconfig/fontconfig-2.3.2.patch.hide	Thu Feb 14 14:07:07 2008 -0800
@@ -315,7 +315,7 @@
 +	    if (!FcCompare (p, hideFont, score, result))
 +		res = 0;
 +
-+            if ( hideFont )
++            if ( (hideFont != NULL) && (hideFont != s->fonts[f]) )
 +            {
 +		FcPatternDestroy ( hideFont );
 +            }
@@ -379,7 +379,7 @@
 +	    if (!FcCompare (p, hideFont, new->score, result))
 +		res = 0;
 +
-+            if ( hideFont )
++            if ( (hideFont != NULL) && (hideFont != s->fonts[f]) )
 +            {
 +		FcPatternDestroy ( hideFont );
 +            }