Fix segfault when consuming zero-length caches in fc-cat (which has no

    config, so FcConfigAddFontDir shouldn't be called.)

diff --git a/ChangeLog b/ChangeLog
index a09abf5483839a0ecd9ee6cd9571168ff82a9b21..8bcf9fb64b8236712ea342df0b6f176353ccf241 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-14  Patirck Lam  <plam@mit.edu>
+       * src/fccache.c (FcDirCacheConsume):
+
+       Fix segfault when consuming zero-length caches in fc-cat
+       (which has no config, so FcConfigAddFontDir shouldn't be called.)
+
 2006-01-14  Patrick Lam  <plam@mit.edu>
        * fc-cache/fc-cache.c (scanDirs):
        * fontconfig/fontconfig.h:

diff --git a/src/fccache.c b/src/fccache.c
index b36dbd253087f504a1e3310178e0725b20ac3d58..10e65ddc0d2ce68546cc8a8b543f0f538edd8385 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -978,7 +978,8 @@ FcDirCacheConsume (int fd, const char * dir, FcFontSet *set, FcConfig *config)
     {
        pos = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
        lseek (fd, pos, SEEK_SET);
-       FcConfigAddFontDir (config, (FcChar8 *)dir);
+       if (config)
+           FcConfigAddFontDir (config, (FcChar8 *)dir);
        return FcTrue;
     }