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

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 849d55e6581dc6cfa889f1847639573df3274888..45c762e5a41381d90f4e0dd025f6ab4f8996ce51 100644 (file)
--- 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 57fd606bf20660286a232aef92368faa9c3ba367..e718ca2ea5f6cdc450556b8cf5fffe6703a6d94a 100644 (file)
--- 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);