From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Dec 2004 04:11:11 +0000 (+0000)
Subject: Check for non-empty face->family_name and face->style_name before using
X-Git-Tag: fc-2_2_97~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e4125ef950ada3413a542dc457a4d36c5495dcd7;p=fontconfig.git

Check for non-empty face->family_name and face->style_name before using
    those for the font. Empty names match everything. Bug #171.
---

diff --git a/ChangeLog b/ChangeLog
index fa19016..159a76a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-04  Keith Packard  <keithp@keithp.com>
+
+	* src/fcfreetype.c: (FcFreeTypeQuery):
+	Check for non-empty face->family_name and face->style_name
+	before using those for the font.  Empty names match everything.
+	Bug #171.
+
 2004-12-04  Keith Packard  <keithp@keithp.com>
 
 	* configure.in:
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 7ca65fd..7bc8b53 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1163,19 +1163,21 @@ FcFreeTypeQuery (const FcChar8	*file,
 	    free (utf8);
     }
     
-    if (!nfamily && face->family_name)
+    if (!nfamily && face->family_name && 
+	FcStrCmpIgnoreBlanksAndCase (face->family_name, "") != 0)
     {
 	if (FcDebug () & FC_DBG_SCANV)
-	    printf ("using FreeType family %s", face->family_name);
+	    printf ("using FreeType family \"%s\"\n", face->family_name);
 	if (!FcPatternAddString (pat, FC_FAMILY, face->family_name))
 	    goto bail1;
 	++nfamily;
     }
     
-    if (!nstyle && face->style_name)
+    if (!nstyle && face->style_name &&
+	FcStrCmpIgnoreBlanksAndCase (face->style_name, "") != 0)
     {
 	if (FcDebug () & FC_DBG_SCANV)
-	    printf ("using FreeType style %s", face->family_name);
+	    printf ("using FreeType style \"%s\"\n", face->style_name);
 	if (!FcPatternAddString (pat, FC_STYLE, face->style_name))
 	    goto bail1;
 	++nstyle;
@@ -1199,7 +1201,7 @@ FcFreeTypeQuery (const FcChar8	*file,
 	strncpy ((char *) family, (char *) start, end - start);
 	family[end - start] = '\0';
 	if (FcDebug () & FC_DBG_SCANV)
-	    printf ("using filename for family %s", family);
+	    printf ("using filename for family %s\n", family);
 	if (!FcPatternAddString (pat, FC_FAMILY, family))
 	{
 	    free (family);