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:17 +0000 |
commit | 0e8f5b62507c679ca1d14d4ca10e4900e77889c4 (patch) | |
tree | 42267c6ca93453e2246533f977f3e7c653e9dc14 /meta/recipes-graphics/fontconfig/fontconfig | |
parent | de57f3bca3acab60f445c43a07397c2b298d79a7 (diff) | |
download | poky-0e8f5b62507c679ca1d14d4ca10e4900e77889c4.tar.gz |
fontconfig: update to 2.12.6
Add a patch to avoid crashing under qemu.
(From OE-Core rev: da1d9898e953207a7649dfa765dd37eea9baf55d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig/fontconfig')
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch | 28 |
1 files changed, 28 insertions, 0 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 @@ | |||
1 | From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 11 Oct 2017 17:40:09 +0300 | ||
4 | Subject: [PATCH] src/fcxml.c: avoid double free() of filename | ||
5 | |||
6 | It's also freed after bail1, so no need to do it here. | ||
7 | |||
8 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | src/fcxml.c | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/fcxml.c b/src/fcxml.c | ||
15 | index 19ce96a..edb6054 100644 | ||
16 | --- a/src/fcxml.c | ||
17 | +++ b/src/fcxml.c | ||
18 | @@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config, | ||
19 | |||
20 | fd = FcOpen ((char *) filename, O_RDONLY); | ||
21 | if (fd == -1) { | ||
22 | - FcStrFree (filename); | ||
23 | goto bail1; | ||
24 | } | ||
25 | |||
26 | -- | ||
27 | 2.14.1 | ||
28 | |||