mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

shm: Generate an error when shm access failed even without a resource

Browse source 
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
Sebastian Wick 2025-03-21 19:43:23 +01:00
parent 9367c4da76
commit d2a3d33063
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/wayland-shm.c
View file

@ -86,6 +86,8 @@ struct wl_shm_buffer {
struct wl_resource *resource; struct wl_resource *resource;
int internal_refcount; int internal_refcount;
int external_refcount; int external_refcount;
struct wl_client *client;
struct wl_listener client_destroy_listener;
int32_t width, height; int32_t width, height;
int32_t stride; int32_t stride;
uint32_t format; uint32_t format;
@ -187,6 +189,8 @@ shm_buffer_unref(struct wl_shm_buffer *buffer, bool external)
if (buffer->internal_refcount + buffer->external_refcount > 0) if (buffer->internal_refcount + buffer->external_refcount > 0)
return; return;
if (buffer->client)
wl_list_remove(&buffer->client_destroy_listener.link);
shm_pool_unref(buffer->pool, false); shm_pool_unref(buffer->pool, false);
free(buffer); free(buffer);
} }
@ -230,6 +234,17 @@ format_is_supported(struct wl_client *client, uint32_t format)
return false; return false;
} }
static void
shm_buffer_client_destroy_notify(struct wl_listener *listener, void *data)
{
struct wl_shm_buffer *buffer =
wl_container_of(listener, buffer, client_destroy_listener);
buffer->client = NULL;
wl_list_remove(&buffer->client_destroy_listener.link);
}
static void static void
shm_pool_create_buffer(struct wl_client *client, struct wl_resource *resource, shm_pool_create_buffer(struct wl_client *client, struct wl_resource *resource,
uint32_t id, int32_t offset, uint32_t id, int32_t offset,
@ -262,6 +277,12 @@ shm_pool_create_buffer(struct wl_client *client, struct wl_resource *resource,
return; return;
} }
buffer->client = client;
buffer->client_destroy_listener.notify =
shm_buffer_client_destroy_notify;
wl_client_add_destroy_listener(buffer->client,
&buffer->client_destroy_listener);
buffer->internal_refcount = 1; buffer->internal_refcount = 1;
buffer->external_refcount = 0; buffer->external_refcount = 0;
buffer->width = width; buffer->width = width;
@ -763,6 +784,11 @@ wl_shm_buffer_end_access(struct wl_shm_buffer *buffer)
wl_resource_post_error(buffer->resource, wl_resource_post_error(buffer->resource,
WL_SHM_ERROR_INVALID_FD, WL_SHM_ERROR_INVALID_FD,
"error accessing SHM buffer"); "error accessing SHM buffer");
} else if (buffer->client) {
wl_client_post_implementation_error(buffer->client,
"Error accessing SHM buffer of a "
"wl_buffer resource which has "
"already been destroyed");
} }
sigbus_data->fallback_mapping_used = 0; sigbus_data->fallback_mapping_used = 0;
} }