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

xdg-shell: Move check for surface having buffer earlier

Browse Source 
It's illegal to create an xdg_surface for a surface which already has a
buffer attached to it. We check for this, but only after we've created
our weston_desktop_surface; this simply avoids creating the internal
tracking structure when we're only going to destroy it after posting the
error.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2021-05-18 17:15:58 +01:00
parent 6f6fd2686d
commit baa8f6b1af
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston-desktop/xdg-shell.c
+7 -7
View File
@@ -1422,6 +1422,13 @@ weston_desktop_xdg_shell_protocol_get_xdg_surface(struct wl_client *wl_client,
wl_resource_get_user_data(surface_resource); wl_resource_get_user_data(surface_resource);
struct weston_desktop_xdg_surface *surface; struct weston_desktop_xdg_surface *surface;
if (wsurface->buffer_ref.buffer != NULL) {
wl_resource_post_error(resource,
XDG_SURFACE_ERROR_UNCONFIGURED_BUFFER,
"xdg_surface must not have a buffer at creation");
return;
}
surface = zalloc(weston_desktop_surface_role_biggest_size); surface = zalloc(weston_desktop_surface_role_biggest_size);
if (surface == NULL) { if (surface == NULL) {
wl_client_post_no_memory(wl_client); wl_client_post_no_memory(wl_client);
@@ -1449,13 +1456,6 @@ weston_desktop_xdg_shell_protocol_get_xdg_surface(struct wl_client *wl_client,
id, weston_desktop_xdg_surface_resource_destroy); id, weston_desktop_xdg_surface_resource_destroy);
if (surface->resource == NULL) if (surface->resource == NULL)
return; return;
if (wsurface->buffer_ref.buffer != NULL) {
wl_resource_post_error(surface->resource,
XDG_SURFACE_ERROR_UNCONFIGURED_BUFFER,
"xdg_surface must not have a buffer at creation");
return;
}
} }
static void static void