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

surface: fix abort on NULL buffer attach 

Fixes: ba0525c5c0 ("surface: drop wlr_surface_state.buffer_resource")
Closes: https://github.com/swaywm/wlroots/issues/3173
This commit is contained in:
Simon Ser 2021-09-07 08:38:48 +02:00
parent ba0525c5c0
commit 88919464ef
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
types/wlr_surface.c
View File

@ -42,10 +42,13 @@ static void surface_handle_attach(struct wl_client *client,
struct wl_resource *buffer_resource, int32_t dx, int32_t dy) { struct wl_resource *buffer_resource, int32_t dx, int32_t dy) {
struct wlr_surface *surface = wlr_surface_from_resource(resource); struct wlr_surface *surface = wlr_surface_from_resource(resource);
struct wlr_buffer *buffer = wlr_buffer_from_resource(buffer_resource); struct wlr_buffer *buffer = NULL;
if (buffer == NULL) { if (buffer_resource != NULL) {
wl_resource_post_error(buffer_resource, 0, "unknown buffer type"); buffer = wlr_buffer_from_resource(buffer_resource);
return; if (buffer == NULL) {
wl_resource_post_error(buffer_resource, 0, "unknown buffer type");
return;
}
} }
surface->pending.committed |= WLR_SURFACE_STATE_BUFFER; surface->pending.committed |= WLR_SURFACE_STATE_BUFFER;