From: Keith Packard <keithp@neko.keithp.com>
Date: Fri, 1 Sep 2006 19:07:10 +0000 (-0700)
Subject: Fix memory leaks in fc-cache directory cleaning code.
X-Git-Tag: 2.3.96~20
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1741499e2387f0c1e692801a1ef3c6ce5d043f9f;p=fontconfig.git

Fix memory leaks in fc-cache directory cleaning code.

valgrind found a few leaks in the new cache cleaning code.
---

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 6957a65..0686481 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -287,10 +287,16 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
     struct stat	target_stat;
 
     dir_base = FcStrPlus (dir, "/");
+    if (!dir_base)
+    {
+	fprintf (stderr, "%s: out of memory\n", dir);
+	return FcFalse;
+    }
     if (access ((char *) dir, W_OK|X_OK) != 0)
     {
 	if (verbose)
 	    printf ("%s: not cleaning unwritable cache directory\n", dir);
+	FcStrFree (dir_base);
 	return FcTrue;
     }
     if (verbose)
@@ -299,6 +305,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
     if (!d)
     {
 	perror (dir);
+	FcStrFree (dir_base);
 	return FcFalse;
     }
     while ((ent = readdir (d)))
@@ -347,10 +354,12 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
 		ret = FcFalse;
 	    }
 	}
+	FcDirCacheUnload (cache);
         FcStrFree (file_name);
     }
     
     closedir (d);
+    FcStrFree (dir_base);
     return ret;
 }