From 1d0bde0639fa81021c2f1b8f9ef114a5c1944ecf Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 1 Dec 2014 13:47:10 -0500 Subject: [PATCH] ecore-wayland: Add safety check for xdg_popup creation Summary: xdg_shell_get_xdg_popup could return NULL, in which case any calls below would cause an abort in the wayland libraries, so this adds a trap for that. @fix Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 5fe64102cb..46b86189b3 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -379,6 +379,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win) _ecore_wl_disp->serial, win->allocation.x, win->allocation.y, 0); + if (!win->xdg_popup) return; xdg_popup_set_user_data(win->xdg_popup, win); xdg_popup_add_listener(win->xdg_popup, &_ecore_xdg_popup_listener, win);