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

wlr_surface: Post error if multiple role objects created 

This fixes an assertion failure if a client tries to do this, e.g. by
creating multiple toplevel objects for the same surface. If the same
role data is set multiple times, this does not cause an error, which is
how cursors use this interface.
This commit is contained in:
Scott Anderson 2020-03-22 00:55:54 +13:00 committed by Simon Ser
parent b614ded3fc
commit 34303e1b47
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
types/wlr_surface.c
View File

@ -667,8 +667,14 @@ bool wlr_surface_set_role(struct wlr_surface *surface,
} }
return false; return false;
} }
if (surface->role_data != NULL && surface->role_data != role_data) {
wl_resource_post_error(error_resource, error_code,
"Cannot reassign role %s to wl_surface@%d,"
"role object still exists", role->name,
wl_resource_get_id(surface->resource));
return false;
}
assert(surface->role_data == NULL);
surface->role = role; surface->role = role;
surface->role_data = role_data; surface->role_data = role_data;
return true; return true;