Fix double free in error case.

diff --git a/ChangeLog b/ChangeLog
index 0c63b805d341cc52de0bf458faf56e3303997037..0a8dbb917042e1223b722385a7ae84669aefa649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-03  Patrick Lam  <plam@mit.edu>
+       * src/fccache.c (FcDirCacheUnlink):
+
+       Fix double free in error case.
+
 2006-01-31  Behdad Esfabod  <behdad@cs.utoronto.edu>
            Stephan Kulow  <coolo@suse.de>
        reviewed by: plam

diff --git a/src/fccache.c b/src/fccache.c
index 886e652515423cf7d2220d33f467bc15467ec3a5..0de020ceb4050d7cbaae896a59af6dbeb25b4d00 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -743,7 +743,6 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
        }
     } while (strcmp (name_buf, cache_file) != 0);
 
-    FcStrFree ((FcChar8 *)cache_file);
     close (fd);
 
     if (stat ((char *) cache_hashed, &cache_stat) == 0 &&
@@ -753,6 +752,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
        goto bail;
     }
 
+    FcStrFree ((FcChar8 *)cache_file);
     FcStrFree ((FcChar8 *)cache_hashed);
     return FcTrue;