summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch')
-rw-r--r--recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch b/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
deleted file mode 100644
index e3b1fa8a..00000000
--- a/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 60f8817f371123b9c36b3ff1120eec1e8f9e3d10 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Mon, 31 Oct 2016 19:21:58 -0500
4Subject: [PATCH weston] xwayland: Fix crash when run with no input device
5
6Starting an xterm with no input device led to a crash
7because weston_wm_pick_seat() was returning garbage and
8weston_wm_selection_init() was trying to use the garbage.
9
10Upstream-Status: Accepted [https://cgit.freedesktop.org/wayland/weston/commit/?id=e7fff215ada3fd3d1b2af664888f960c082f9065]
11
12Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
13---
14 xwayland/selection.c | 10 +++++++---
15 xwayland/window-manager.c | 6 ++++--
16 2 files changed, 11 insertions(+), 5 deletions(-)
17
18Index: weston-1.11.0/xwayland/selection.c
19===================================================================
20--- weston-1.11.0.orig/xwayland/selection.c 2016-05-19 16:36:04.000000000 -0500
21+++ weston-1.11.0/xwayland/selection.c 2016-11-01 14:32:48.000000000 -0500
22@@ -708,6 +708,8 @@
23 wm->atom.clipboard, mask);
24
25 seat = weston_wm_pick_seat(wm);
26+ if (seat == NULL)
27+ return;
28 wm->selection_listener.notify = weston_wm_set_selection;
29 wl_signal_add(&seat->selection_signal, &wm->selection_listener);
30
31Index: weston-1.11.0/xwayland/window-manager.c
32===================================================================
33--- weston-1.11.0.orig/xwayland/window-manager.c 2016-05-19 16:36:04.000000000 -0500
34+++ weston-1.11.0/xwayland/window-manager.c 2016-11-01 11:47:14.549606964 -0500
35@@ -1303,8 +1303,10 @@
36 struct weston_seat *
37 weston_wm_pick_seat(struct weston_wm *wm)
38 {
39- return container_of(wm->server->compositor->seat_list.next,
40- struct weston_seat, link);
41+ struct wl_list *seats = wm->server->compositor->seat_list.next;
42+ if (wl_list_empty(seats))
43+ return NULL;
44+ return container_of(seats, struct weston_seat, link);
45 }
46
47 static struct weston_seat *