diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-10 15:02:27 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-09 12:33:11 +0000 |
| commit | da1d9898e953207a7649dfa765dd37eea9baf55d (patch) | |
| tree | 4beec13d56ac033cf3a1a3904588b78ef03f6c51 /meta | |
| parent | ffe5c27179bd82a87ab632766e7050c2a2d134e6 (diff) | |
| download | openembedded-core-contrib-da1d9898e953207a7649dfa765dd37eea9baf55d.tar.gz | |
fontconfig: update to 2.12.6
Add a patch to avoid crashing under qemu.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb) | 7 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch new file mode 100644 index 0000000000..3ca9fde967 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch @@ -0,0 +1,28 @@ +From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 11 Oct 2017 17:40:09 +0300 +Subject: [PATCH] src/fcxml.c: avoid double free() of filename + +It's also freed after bail1, so no need to do it here. + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/fcxml.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/fcxml.c b/src/fcxml.c +index 19ce96a..edb6054 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config, + + fd = FcOpen ((char *) filename, O_RDONLY); + if (fd == -1) { +- FcStrFree (filename); + goto bail1; + } + +-- +2.14.1 + diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb index a058b35984..fa5f0eecc2 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb @@ -22,9 +22,12 @@ DEPENDS = "expat freetype zlib gperf-native" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ + file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \ " -SRC_URI[md5sum] = "4fb01fc3f41760c41c69e37cc784b658" -SRC_URI[sha256sum] = "fd5a6a663f4c4a00e196523902626654dd0c4a78686cbc6e472f338e50fdf806" + +SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" +SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334" + do_configure_prepend() { # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280 |