diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-05 23:38:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 10:39:25 +0000 |
commit | 0e3a1b57fc4a1eba48f52064b4230075e711ec13 (patch) | |
tree | db456ad638e6ebad0ce706cd2d8e5d59ad8e7260 /meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch | |
parent | 7f77f9292930c6b3cc5ae2a67bdb48e53827f2fe (diff) | |
download | poky-0e3a1b57fc4a1eba48f52064b4230075e711ec13.tar.gz |
cairo: fix CVE-2018-19876 CVE-2019-6461 CVE-2019-6462
CVE-2018-19876 is a backport from upstream.
CVE-2019-6461 and CVE-2019-6462 are patches taken from Clear Linux.
(From OE-Core rev: 078e4d5c2114d942806cd0d5ad501805a011e841)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch b/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch new file mode 100644 index 0000000000..4252a5663b --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | CVE: CVE-2018-19876 | ||
2 | Upstream-Status: Backport | ||
3 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
4 | |||
5 | From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 | ||
6 | From: Carlos Garcia Campos <cgarcia@igalia.com> | ||
7 | Date: Mon, 19 Nov 2018 12:33:07 +0100 | ||
8 | Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in | ||
9 | cairo_ft_apply_variations | ||
10 | |||
11 | Fixes a crash when using freetype >= 2.9 | ||
12 | --- | ||
13 | src/cairo-ft-font.c | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c | ||
17 | index 325dd61b4..981973f78 100644 | ||
18 | --- a/src/cairo-ft-font.c | ||
19 | +++ b/src/cairo-ft-font.c | ||
20 | @@ -2393,7 +2393,11 @@ skip: | ||
21 | done: | ||
22 | free (coords); | ||
23 | free (current_coords); | ||
24 | +#if HAVE_FT_DONE_MM_VAR | ||
25 | + FT_Done_MM_Var (face->glyph->library, ft_mm_var); | ||
26 | +#else | ||
27 | free (ft_mm_var); | ||
28 | +#endif | ||
29 | } | ||
30 | } | ||
31 | |||
32 | -- | ||
33 | 2.11.0 | ||
34 | |||