Don't use FcCharSetCopy in FcCharSetMerge

The Copy function is actually a ref, not real copy.

diff --git a/doc/fccharset.fncs b/doc/fccharset.fncs
index 93e1f5c1e5fcfac1f3e0e14bd8d466930185a61b..0dd7d1a5c644d4a00ac052d2c7aba176515486c6 100644 (file)
--- a/doc/fccharset.fncs
+++ b/doc/fccharset.fncs
@@ -104,7 +104,7 @@ Returns a set including only those chars found in <parameter>a</parameter> but n
 @TYPE2@                const FcCharSet *       @ARG2@          b
 @PURPOSE@      Merge charsets
 @DESC@
-If <parameter>a</parameter> is NULL, returns a copy of <parameter>b</parameter>.
+If <parameter>a</parameter> is NULL, returns a newly-created copy of <parameter>b</parameter>.
 If <parameter>a</parameter> is an FcCharSet object owned by fontconfig that
 cannot be modified, it returns the union of <parameter>a</parameter> and
 <parameter>b</parameter> in a newly-created FcCharSet object.

diff --git a/src/fccharset.c b/src/fccharset.c
index 1891f08f01ae28b6d05b45442c4a81cceb3625c5..2daa39d59bef9ef68b43257505e11dfb7a359d34 100644 (file)
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -459,14 +459,15 @@ FcCharSetMerge (FcCharSet *a, const FcCharSet *b)
     FcCharSetIter    ai, bi;
 
     if (a == NULL) {
-       return FcCharSetCopy ((FcCharSet *) b);
+       fcs = a = FcCharSetCreate ();
     } else if (a->ref == FC_REF_CONSTANT) {
        fcs = FcCharSetCreate ();
-       if (fcs == NULL)
-           return NULL;
     } else
        fcs = a;
 
+    if (fcs == NULL)
+       return NULL;
+
     FcCharSetIterStart (a, &ai);
     FcCharSetIterStart (b, &bi);
     while (ai.leaf || bi.leaf)