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

xdg_shell stable: fix zero-sized positioner anchor_rect 

We used 0 as unset-check value before, which was fine when 0-width
was invalid, but isn't anymore
This commit is contained in:
Dominique Martinet 2018-02-15 08:07:57 +01:00
parent 714f90a9d0
commit 56ab3e9b10
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
types/wlr_xdg_shell.c
View File

@ -334,6 +334,10 @@ static void xdg_shell_create_positioner(struct wl_client *wl_client,
return; return;
} }
/* set widths to detect improper usages of get_popup */
positioner->size.width = -1;
positioner->anchor_rect.width = -1;
positioner->resource = wl_resource_create(wl_client, positioner->resource = wl_resource_create(wl_client,
&xdg_positioner_interface, &xdg_positioner_interface,
wl_resource_get_version(resource), wl_resource_get_version(resource),
@ -500,7 +504,7 @@ static void xdg_surface_get_popup(struct wl_client *client,
struct wlr_xdg_positioner *positioner = struct wlr_xdg_positioner *positioner =
wl_resource_get_user_data(positioner_resource); wl_resource_get_user_data(positioner_resource);
if (positioner->size.width == 0 || positioner->anchor_rect.width == 0) { if (positioner->size.width == -1 || positioner->anchor_rect.width == -1) {
wl_resource_post_error(resource, wl_resource_post_error(resource,
XDG_WM_BASE_ERROR_INVALID_POSITIONER, XDG_WM_BASE_ERROR_INVALID_POSITIONER,
"positioner object is not complete"); "positioner object is not complete");