fontconfig/fix-pattern-duplicate.diff

22 lines
644 B
Diff

diff -ru fontconfig-2.4.2/src/fcpat.c fontconfig-2.4.2.new/src/fcpat.c
--- fontconfig-2.4.2/src/fcpat.c 2006-12-02 21:54:53.000000000 +0100
+++ fontconfig-2.4.2.new/src/fcpat.c 2007-03-12 16:08:30.000000000 +0100
@@ -925,10 +925,14 @@
for (i = 0; i < orig->num; i++)
{
for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l))
- if (!FcPatternObjectAdd (new, e[i].object,
- FcValueCanonicalize(&l->value),
- FcTrue))
+ {
+ if (!FcPatternObjectAddWithBinding (new, e[i].object,
+ FcValueCanonicalize(&l->value),
+ l->binding,
+ FcTrue))
goto bail1;
+
+ }
}
return new;