From 7261c7414e19ee9d771a2223bedf2d136b8f011d Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 11 Nov 2019 00:21:14 -0700
Subject: [PATCH] pango: fix CVE-2019-1010238.

---
 srcpkgs/pango/patches/CVE-2019-1010238.patch | 33 ++++++++++++++++++++
 srcpkgs/pango/template                       |  4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pango/patches/CVE-2019-1010238.patch

diff --git a/srcpkgs/pango/patches/CVE-2019-1010238.patch b/srcpkgs/pango/patches/CVE-2019-1010238.patch
new file mode 100644
index 00000000000..afb832e0cfc
--- /dev/null
+++ b/srcpkgs/pango/patches/CVE-2019-1010238.patch
@@ -0,0 +1,33 @@
+From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+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
+---
+ 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.22.0
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index b10c1e0b9b3..4722b91fcfc 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,8 +1,7 @@
 # Template file for 'pango'
 pkgname=pango
-reverts="1.44.5_1"
 version=1.42.4
-revision=4
+revision=5
 build_style=gnu-configure # switch to meson when possible
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection) --disable-gtk-doc"
@@ -14,6 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d
+patch_args="-Np1"
 
 # Package build options
 build_options="gir"