From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 5 Jun 2009 21:15:53 +0000 (-0400)
Subject: Always set *changed in FcCharsetMerge
X-Git-Tag: 2.7.0~10
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=cce69b07efd82056c8eb855ef7ac7e02c94439da;p=fontconfig.git

Always set *changed in FcCharsetMerge
---

diff --git a/src/fccharset.c b/src/fccharset.c
index fba1f4a..cba21c7 100644
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -470,8 +470,11 @@ FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed)
     int		ai = 0, bi = 0;
     FcChar16	an, bn;
 
-    if (a->ref == FC_REF_CONSTANT)
+    if (a->ref == FC_REF_CONSTANT) {
+	if (changed)
+	    *changed = FcFalse;
 	return FcFalse;
+    }
 
     if (changed) {
 	*changed = !FcCharSetIsSubset(b, a);