Only add a config file to the set of config files once.

reviewed by: plam

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 849d55e..45c762e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-30  Behdad Befahbod  <behdad@cs.toronto.edu>
+	reviewed by: plam
+
+	* src/fcxml.c (FcConfigParseAndLoad):
+
+	Only add a config file to the set of config files once.
+
 2005-11-29  Patrick Lam  <plam@mit.edu>
 	* src/fcint.h (FcCacheBankToIndex);
 
diff --git a/src/fcxml.c b/src/fcxml.c
index 57fd606..e718ca2 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2368,6 +2368,12 @@ FcConfigParseAndLoad (FcConfig	    *config,
     if (!filename)
 	goto bail0;
     
+    if (FcStrSetMember (config->configFiles, filename))
+    {
+        FcStrFree (filename);
+        return FcTrue;
+    }
+
     if (!FcStrSetAdd (config->configFiles, filename))
     {
 	FcStrFree (filename);