blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg_shell popup: fix potential segv in handle_destroy 

surface could be NULL there if the popup had been made
inert before
This commit is contained in:
Dominique Martinet 2018-06-28 13:37:59 +09:00
parent 9f1d6c58ed
commit 970687a01c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/xdg_shell/wlr_xdg_popup.c
View File

@ -186,7 +186,7 @@ static void xdg_popup_handle_destroy(struct wl_client *client,
struct wlr_xdg_surface *surface = struct wlr_xdg_surface *surface =
wlr_xdg_surface_from_popup_resource(resource); wlr_xdg_surface_from_popup_resource(resource);
if (!wl_list_empty(&surface->popups)) { if (surface && !wl_list_empty(&surface->popups)) {
wl_resource_post_error(surface->client->resource, wl_resource_post_error(surface->client->resource,
XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP, XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP,
"xdg_popup was destroyed while it was not the topmost popup"); "xdg_popup was destroyed while it was not the topmost popup");

2
types/xdg_shell_v6/wlr_xdg_popup_v6.c
View File

@ -214,7 +214,7 @@ static void xdg_popup_handle_destroy(struct wl_client *client,
struct wlr_xdg_surface_v6 *surface = struct wlr_xdg_surface_v6 *surface =
xdg_surface_from_xdg_popup_resource(resource); xdg_surface_from_xdg_popup_resource(resource);
if (!wl_list_empty(&surface->popups)) { if (surface && !wl_list_empty(&surface->popups)) {
wl_resource_post_error(surface->client->resource, wl_resource_post_error(surface->client->resource,
ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP, ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP,
"xdg_popup was destroyed while it was not the topmost popup"); "xdg_popup was destroyed while it was not the topmost popup");