From d8b63d9ad6c15795d82d2bc6eab0a42dff6cfb36 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 19 Aug 2019 21:47:09 +0800 Subject: pango: fix CVE-2019-1010238 (From OE-Core rev: 20b23cb40917b1c83b862817b13f0eefc8fa7a64) Signed-off-by: Anuj Mittal Signed-off-by: Armin Kuster (cherry picked from commit 65631a048f57965745dc8cc23cb80c4c3a71ba94) [Fix up for thud context] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../pango/pango/CVE-2019-1010238.patch | 38 ++++++++++++++++++++++ meta/recipes-graphics/pango/pango_1.42.4.bb | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch diff --git a/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch b/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch new file mode 100644 index 0000000000..5b0c342f49 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch @@ -0,0 +1,38 @@ +From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 10 Jul 2019 20:26:23 -0400 +Subject: [PATCH] bidi: Be safer against bad input + +Don't run off the end of an array that we +allocated to certain length. + +Closes: https://gitlab.gnome.org/GNOME/pango/issues/342 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54] +CVE: CVE-2019-1010238 +Signed-off-by: Anuj Mittal +--- + pango/pango-bidi-type.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c +index 3e46b66c..5c02dbbb 100644 +--- a/pango/pango-bidi-type.c ++++ b/pango/pango-bidi-type.c +@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, + for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) + { + gunichar ch = g_utf8_get_char (p); +- FriBidiCharType char_type; +- char_type = fribidi_get_bidi_type (ch); ++ FriBidiCharType char_type = fribidi_get_bidi_type (ch); ++ ++ if (i == n_chars) ++ break; ++ + bidi_types[i] = char_type; + ored_types |= char_type; + if (FRIBIDI_IS_STRONG (char_type)) +-- +2.21.0 + diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb index 22fe3af15d..f6a3a5ac4c 100644 --- a/meta/recipes-graphics/pango/pango_1.42.4.bb +++ b/meta/recipes-graphics/pango/pango_1.42.4.bb @@ -15,7 +15,9 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec SRC_URI += "file://run-ptest \ file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ -" + file://CVE-2019-1010238.patch \ + " + SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" -- cgit v1.2.3-54-g00ecf