Toast broken global cache files.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 646843ce5bcd0fb738ab72511e4276326efad552..1552c66647e10c326fefc91365973ce17c32a513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-31  Mike Fabian  <mfabian@suse.de>
+       reviewed by: plam
+
+       * src/fccache.c (FcGlobalCacheLoad):
+
+       Toast broken global cache files.
+
 2006-01-30  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcGlobalCacheReadDir):
 

diff --git a/src/fccache.c b/src/fccache.c
index 4b3adff2753d2ae1dd1402bfedd8c8044043a63d..886e652515423cf7d2220d33f467bc15467ec3a5 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -219,9 +219,9 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
     cache->updated = FcFalse;
 
     if (!FcCacheReadString (cache->fd, name_buf, sizeof (name_buf)))
-       return;
+        goto bail_and_destroy;
     if (strcmp (name_buf, FC_GLOBAL_MAGIC_COOKIE) != 0)
-       return;
+        goto bail_and_destroy;
 
     current_arch_machine_name = FcCacheMachineSignature ();
     current_arch_start = FcCacheSkipToArch(cache->fd,