[PATCH] xwayland/selection: do not remove NULL property_source

Greg V greg at unrelenting.technology
Tue Apr 10 17:00:25 UTC 2018


Happened mostly with neovim's xclip usage.
---
This fixes the most frequent source of crashes for me.

 xwayland/selection.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xwayland/selection.c b/xwayland/selection.c
index f145089f..b0bccc0d 100644
--- a/xwayland/selection.c
+++ b/xwayland/selection.c
@@ -370,7 +370,9 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
 	if (len == -1) {
 		weston_log("read error from data source: %m\n");
 		weston_wm_send_selection_notify(wm, XCB_ATOM_NONE);
-		wl_event_source_remove(wm->property_source);
+		if (wm->property_source) {
+			wl_event_source_remove(wm->property_source);
+		}
 		wm->property_source = NULL;
 		close(fd);
 		wl_array_release(&wm->source_data);
-- 
2.16.2



More information about the wayland-devel mailing list