summaryrefslogtreecommitdiff
path: root/external/fontconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-22 11:23:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-22 11:25:45 +0000
commit903dd3fe075104d4e656c57949bc32b1b9a74e8b (patch)
treef9745fe9e31e23fb7d9c4393e20a8ca02fb39856 /external/fontconfig
parent404e4f55ab513a17ed5f9e47fc6fb9656bea9f2b (diff)
Resolves: ofz#311 fix leak in old fontconfig we're using
I guess we should bump the version of this Change-Id: I4e0b16fe8483f7c8494bb6ca6c5f87cd3420d721
Diffstat (limited to 'external/fontconfig')
-rw-r--r--external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.126
-rw-r--r--external/fontconfig/UnpackedTarball_fontconfig.mk1
2 files changed, 27 insertions, 0 deletions
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 000000000000..8fd4dcf29117
--- /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@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 413ffeffc7fa..be440335ecf9 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: