walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup: Handle patterns without family 

Pointed out by Akira Tagoh.
This commit is contained in:
Matthias Clasen 2020-08-25 07:26:32 -04:00
parent 51d40491fc
commit e117d6768c
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/fcmatch.c
View File

@ -525,25 +525,28 @@ FcCompareDataInit (FcPattern *pat,
free); free);
elt = FcPatternObjectFindElt (pat, FC_FAMILY_OBJECT); elt = FcPatternObjectFindElt (pat, FC_FAMILY_OBJECT);
for (l = FcPatternEltValues(elt), i = 0; l; l = FcValueListNext(l), i++) if (elt)
{ {
key = FcValueString (&l->value); for (l = FcPatternEltValues(elt), i = 0; l; l = FcValueListNext(l), i++)
if (!FcHashTableFind (table, key, (void **)&e))
{ {
e = malloc (sizeof (FamilyEntry)); key = FcValueString (&l->value);
e->strong_value = 1e99; if (!FcHashTableFind (table, key, (void **)&e))
e->weak_value = 1e99; {
FcHashTableAdd (table, (void *)key, e); e = malloc (sizeof (FamilyEntry));
} e->strong_value = 1e99;
if (l->binding == FcValueBindingWeak) e->weak_value = 1e99;
{ FcHashTableAdd (table, (void *)key, e);
if (i < e->weak_value) }
e->weak_value = i; if (l->binding == FcValueBindingWeak)
} {
else if (i < e->weak_value)
{ e->weak_value = i;
if (i < e->strong_value) }
e->strong_value = i; else
{
if (i < e->strong_value)
e->strong_value = i;
}
} }
} }