Backport all patches to git master for various fixes inc (#1809717)

2020-03-24 14:14:24 -07:00
parent ba75e27d37
commit f02b5ddec4
49 changed files with 4272 additions and 7 deletions
--- a/0042-wayland-Handle-NULL-preedit-text.patch
+++ b/0042-wayland-Handle-NULL-preedit-text.patch
@@ -0,0 +1,35 @@
+From 8592a8591ba7334e2420ec5726a081a5e45f969b Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 24 Mar 2020 16:52:55 +0100
+Subject: [PATCH 42/48] wayland: Handle NULL preedit text
+
+The preedit text may be NULL (eg. when unsetting it). This started
+causing crashes since commit db9b60cc635, duh.
+
+Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1132
+---
+ src/wayland/meta-wayland-text-input.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/wayland/meta-wayland-text-input.c b/src/wayland/meta-wayland-text-input.c
+index deff44c1b..4e7d18b25 100644
+--- a/src/wayland/meta-wayland-text-input.c
+++ b/src/wayland/meta-wayland-text-input.c
+@@ -207,10 +207,12 @@ meta_wayland_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
+ {
+   MetaWaylandTextInput *text_input;
+   struct wl_resource *resource;
+-  gsize pos;
+  gsize pos = 0;
+ 
+   text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input;
+-  pos = g_utf8_offset_to_pointer (text, cursor) - text;
+
+  if (text)
+    pos = g_utf8_offset_to_pointer (text, cursor) - text;
+ 
+   wl_resource_for_each (resource, &text_input->focus_resource_list)
+     {
+-- 
+2.26.0.rc2
+