mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston/desktop: Avoid a potential crash on invalid resource

Browse Source 
This checks for a valid resource when getting a xdg_popup. Similar to
the check in get_toplevel.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2024-10-18 11:13:38 +03:00
parent 8b5bb588df
commit 80e47a7161
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libweston/desktop/xdg-shell-v6.c
View File

@ -1117,12 +1117,9 @@ weston_desktop_xdg_surface_protocol_get_popup(struct wl_client *wl_client,
struct wl_resource *parent_resource,
struct wl_resource *positioner_resource)
{
struct weston_desktop_surface *dsurface =
wl_resource_get_user_data(resource);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
struct weston_desktop_xdg_popup *popup =
weston_desktop_surface_get_implementation_data(dsurface);
struct weston_desktop_surface *dsurface = NULL;
struct weston_surface *wsurface = NULL;
struct weston_desktop_xdg_popup *popup = NULL;
struct weston_desktop_surface *parent_surface =
wl_resource_get_user_data(parent_resource);
struct weston_desktop_xdg_surface *parent =
@ -1131,6 +1128,17 @@ weston_desktop_xdg_surface_protocol_get_popup(struct wl_client *wl_client,
wl_resource_get_user_data(positioner_resource);
struct weston_coord_surface offset;
dsurface = wl_resource_get_user_data(resource);
if (!dsurface) {
wl_resource_post_error(resource,
ZXDG_SURFACE_V6_ERROR_NOT_CONSTRUCTED,
"xdg surface destroyed");
return;
}
wsurface = weston_desktop_surface_get_surface(dsurface);
popup = weston_desktop_surface_get_implementation_data(dsurface);
/* Checking whether the size and anchor rect both have a positive size
* is enough to verify both have been correctly set */
if (positioner->size.width == 0 || positioner->anchor_rect.width == 0) {

20
libweston/desktop/xdg-shell.c
View File

@ -1323,18 +1323,26 @@ weston_desktop_xdg_surface_protocol_get_popup(struct wl_client *wl_client,
struct wl_resource *parent_resource,
struct wl_resource *positioner_resource)
{
struct weston_desktop_surface *dsurface =
wl_resource_get_user_data(resource);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
struct weston_desktop_xdg_popup *popup =
weston_desktop_surface_get_implementation_data(dsurface);
struct weston_desktop_surface *dsurface = NULL;
struct weston_surface *wsurface = NULL;
struct weston_desktop_xdg_popup *popup = NULL;
struct weston_desktop_surface *parent_surface;
struct weston_desktop_xdg_surface *parent;
struct weston_desktop_xdg_positioner *positioner =
wl_resource_get_user_data(positioner_resource);
struct weston_coord_surface offset;
dsurface = wl_resource_get_user_data(resource);
if (!dsurface) {
wl_resource_post_error(resource,
XDG_SURFACE_ERROR_DEFUNCT_ROLE_OBJECT,
"xdg surface destroyed");
return;
}
wsurface = weston_desktop_surface_get_surface(dsurface);
popup = weston_desktop_surface_get_implementation_data(dsurface);
/* Popup parents are allowed to be non-null, but only if a parent is
* specified 'using some other protocol' before committing. Since we
* don't support such a protocol yet, clients cannot legitimately