[fccache] Make sure the cache is current when reusing from open caches

Reported by Diego Santa Cruz.

diff --git a/src/fccache.c b/src/fccache.c
index 53df860bd3f7b649513a8a1a68bb47947c8dbfe8..f35304a40cde1636a5b6d785c13593e13df227a6 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -538,7 +538,13 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
        return NULL;
     cache = FcCacheFindByStat (fd_stat);
     if (cache)
-       return cache;
+    {
+       if (FcCacheTimeValid (cache, dir_stat))
+           return cache;
+       FcDirCacheUnload (cache);
+       cache = NULL;
+    }
+
     /*
      * Lage cache files are mmap'ed, smaller cache files are read. This
      * balances the system cost of mmap against per-process memory usage.