mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 20:27:58 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
de57f3bca3
commit
0e8f5b6250
@@ -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
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user