Fix comparison of family names to ignore leading space properly

Previously fc-match "xxx,nazli" matched Nazli, but "xxx, nazli" didn't.
This was because of a bug in FcCompareFamily's short-circuit check
that forgot to ignore spaces.

diff --git a/src/fcmatch.c b/src/fcmatch.c
index a1814968403595990824ea202bbb0b72571b7172..e46eefe87766e36535dbcfc077d1028101cae492 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -72,7 +72,8 @@ FcCompareFamily (FcValue *v1, FcValue *v2)
     const FcChar8* v1_string = fc_value_string(v1);
     const FcChar8* v2_string = fc_value_string(v2);
 
-    if (FcToLower(*v1_string) != FcToLower(*v2_string))
+    if (FcToLower(*v1_string) != FcToLower(*v2_string) &&
+       *v1_string != ' ' && *v2_string != ' ')
        return 1.0;
 
     return (double) FcStrCmpIgnoreBlanksAndCase (v1_string, v2_string) != 0;