[Libreoffice-commits] core.git: external/fontconfig

[Caolán McNamara]

 external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 |   26 ++++++++++
 external/fontconfig/UnpackedTarball_fontconfig.mk                     |    1 
 2 files changed, 27 insertions(+)

New commits:
commit 903dd3fe075104d4e656c57949bc32b1b9a74e8b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 22 11:23:35 2016 +0000

    Resolves: ofz#311 fix leak in old fontconfig we're using
    
    I guess we should bump the version of this
    
    Change-Id: I4e0b16fe8483f7c8494bb6ca6c5f87cd3420d721

diff --git a/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 b/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1
new file mode 100644
index 0000000..8fd4dcf
--- /dev/null
+++ b/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1
@@ -0,0 +1,26 @@
+From ea1c6ea337b8cf6b86169b565787d0d31a0fc330 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Tue, 27 Mar 2012 21:06:36 +0900
+Subject: [PATCH] Fix a memory leak in FcDirScanConfig()
+
+---
+ src/fcdir.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/fcdir.c b/src/fcdir.c
+index d8b094f..4399afc 100644
+--- a/src/fcdir.c
++++ b/src/fcdir.c
+@@ -211,6 +211,9 @@ bail2:
+ bail1:
+     closedir (d);
+ bail:
++    if (file)
++	free (file);
++
+     return ret;
+ }
+ 
+-- 
+2.9.3
+
diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk
index 413ffef..be44033 100644
--- a/external/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
 	external/fontconfig/fontconfig-2.8.0.patch \
+	external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: