Fix the underlying cause of the below segfault (must usually call

[fontconfig.git] / src / fccache.c

diff --git a/src/fccache.c b/src/fccache.c
index da4abc7a30073dbb6445bbcd998c14be8ae48760..98f0a88294ea837ac07b4e9dc55af3a8ab0ceae5 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -931,7 +931,9 @@ FcCacheReadDirs (FcConfig * config, FcGlobalCache * cache,
            FcStrSetDestroy (subdirs);
            continue;
        }
-       if (FcDirCacheValid (dir) && FcDirCacheRead (set, subdirs, dir, config))
+       if (FcDirCacheValid (dir) && 
+           FcDirCacheHasCurrentArch (dir) && 
+           FcDirCacheRead (set, subdirs, dir, config))
        {
            /* if an old entry is found in the global cache, disable it */
            if ((d = FcGlobalCacheDirFind (cache, (const char *)dir)) != NULL)