[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fccache.c       |    2 ++
 test/test-bz89617.c |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit ea26c5e9f85fb03e89b144878d338d80979a9560
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sat May 28 17:44:10 2016 +1100

    Fix a couple of minor memory leaks
    
    These fixes are needed for the test suite to pass when compiled
    with Address Sanitizer.

diff --git a/src/fccache.c b/src/fccache.c
index 3344a09..71e8f03 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -1173,6 +1173,7 @@ FcDirCacheLock (const FcChar8 *dir,
 	if (!cache_hashed)
 	    break;
 	fd = FcOpen ((const char *)cache_hashed, O_RDWR);
+	FcStrFree (cache_hashed);
 	/* No caches in that directory. simply retry with another one */
 	if (fd != -1)
 	{
@@ -1196,6 +1197,7 @@ FcDirCacheLock (const FcChar8 *dir,
     FcStrListDone (list);
     return fd;
 bail:
+    FcStrListDone (list);
     if (fd != -1)
 	close (fd);
     return -1;
diff --git a/test/test-bz89617.c b/test/test-bz89617.c
index 35df885..f8139a6 100644
--- a/test/test-bz89617.c
+++ b/test/test-bz89617.c
@@ -34,5 +34,7 @@ main (void)
 	FcConfigAppFontAddFile (config, (const FcChar8 *)"/dev/null"))
 	return 1;
 
+    FcConfigDestroy (config);
+
     return 0;
 }