From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 31 Jan 2006 07:16:22 +0000 (+0000)
Subject: Toast broken global cache files.
X-Git-Tag: fc-2_3_94~47
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=28aefd013d1896ffbf389596109eaec729d5d9a5;p=fontconfig.git

Toast broken global cache files.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index 646843c..1552c66 100644
--- 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 4b3adff..886e652 100644
--- 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,