isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/xdg-shell: Handle null-parent in get_popup()

Browse Source 
The spec allows `parent_resource` to be `NULL`, requiring the parent
surface to get specified by some other protocol. Send a protocol error
with some meaningful explanation instead of crashing.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1408
This commit is contained in:
Robert Mader 2020-08-26 20:51:13 +02:00
parent 034c6ab9db
commit 88ff196fe3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wayland/meta-wayland-xdg-shell.c
View File

@ -1845,8 +1845,7 @@ xdg_surface_constructor_get_popup (struct wl_client *client,
MetaWaylandSurface *surface = constructor->surface; MetaWaylandSurface *surface = constructor->surface;
struct wl_resource *xdg_wm_base_resource = constructor->shell_client->resource; struct wl_resource *xdg_wm_base_resource = constructor->shell_client->resource;
struct wl_resource *xdg_surface_resource = constructor->resource; struct wl_resource *xdg_surface_resource = constructor->resource;
MetaWaylandSurface *parent_surface = MetaWaylandSurface *parent_surface;
surface_from_xdg_surface_resource (parent_resource);
MetaWindow *parent_window; MetaWindow *parent_window;
MetaWaylandXdgPositioner *xdg_positioner; MetaWaylandXdgPositioner *xdg_positioner;
MetaWaylandXdgPopup *xdg_popup; MetaWaylandXdgPopup *xdg_popup;
@ -1864,6 +1863,16 @@ xdg_surface_constructor_get_popup (struct wl_client *client,
return; return;
} }
if (!parent_resource)
{
wl_resource_post_error (xdg_wm_base_resource,
XDG_WM_BASE_ERROR_INVALID_POPUP_PARENT,
"Parent surface is null but Mutter does not yet "
"support specifying parent surfaces via other "
"protocols");
}
parent_surface = surface_from_xdg_surface_resource (parent_resource);
if (!META_IS_WAYLAND_XDG_SURFACE (parent_surface->role)) if (!META_IS_WAYLAND_XDG_SURFACE (parent_surface->role))
{ {
wl_resource_post_error (xdg_wm_base_resource, wl_resource_post_error (xdg_wm_base_resource,