mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-13 08:22:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

toplevel_capture: allocate new_request argument on the stack

Browse source 
This fixes a memory leak.
This commit is contained in:
Consolatis 2026-04-03 22:45:13 +02:00
parent c66a910753
commit f168cc0209
2 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wlr/types/wlr_ext_image_capture_source_v1.h
View file

@ -91,7 +91,7 @@ struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1 {
struct { struct {
struct wl_signal destroy; struct wl_signal destroy;
struct wl_signal new_request; // struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request struct wl_signal capture_request; // struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event
} events; } events;
struct { struct {
@ -99,7 +99,7 @@ struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1 {
} WLR_PRIVATE; } WLR_PRIVATE;
}; };
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request { struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event {
struct wlr_ext_foreign_toplevel_handle_v1 *toplevel_handle; struct wlr_ext_foreign_toplevel_handle_v1 *toplevel_handle;
struct wl_client *client; struct wl_client *client;
@ -124,7 +124,7 @@ struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1 *
wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(struct wl_display *display, uint32_t version); wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(struct wl_display *display, uint32_t version);
bool wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_accept( bool wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_accept(
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request, struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event *request,
struct wlr_ext_image_capture_source_v1 *source); struct wlr_ext_image_capture_source_v1 *source);
struct wlr_ext_image_capture_source_v1 *wlr_ext_image_capture_source_v1_create_with_scene_node( struct wlr_ext_image_capture_source_v1 *wlr_ext_image_capture_source_v1_create_with_scene_node(

23
types/ext_image_capture_source_v1/foreign_toplevel.c
View file

@ -17,7 +17,7 @@ foreign_toplevel_manager_from_resource(struct wl_resource *resource) {
} }
bool wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_accept( bool wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_accept(
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request, struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event *request,
struct wlr_ext_image_capture_source_v1 *source) { struct wlr_ext_image_capture_source_v1 *source) {
return wlr_ext_image_capture_source_v1_create_resource(source, request->client, request->new_id); return wlr_ext_image_capture_source_v1_create_resource(source, request->client, request->new_id);
} }
@ -34,18 +34,13 @@ static void foreign_toplevel_manager_handle_create_source(struct wl_client *clie
return; return;
} }
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request = struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event request = {
calloc(1, sizeof(*request)); .toplevel_handle = toplevel_handle,
if (request == NULL) { .client = client,
wl_resource_post_no_memory(manager_resource); .new_id = new_id,
return; };
}
request->toplevel_handle = toplevel_handle; wl_signal_emit_mutable(&manager->events.capture_request, &request);
request->client = client;
request->new_id = new_id;
wl_signal_emit_mutable(&manager->events.new_request, request);
} }
static void foreign_toplevel_manager_handle_destroy(struct wl_client *client, static void foreign_toplevel_manager_handle_destroy(struct wl_client *client,
@ -76,7 +71,7 @@ static void foreign_toplevel_manager_handle_display_destroy(struct wl_listener *
wl_container_of(listener, manager, display_destroy); wl_container_of(listener, manager, display_destroy);
wl_signal_emit_mutable(&manager->events.destroy, NULL); wl_signal_emit_mutable(&manager->events.destroy, NULL);
assert(wl_list_empty(&manager->events.destroy.listener_list)); assert(wl_list_empty(&manager->events.destroy.listener_list));
assert(wl_list_empty(&manager->events.new_request.listener_list)); assert(wl_list_empty(&manager->events.capture_request.listener_list));
wl_list_remove(&manager->display_destroy.link); wl_list_remove(&manager->display_destroy.link);
wl_global_destroy(manager->global); wl_global_destroy(manager->global);
free(manager); free(manager);
@ -102,7 +97,7 @@ wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(struct wl_displa
} }
wl_signal_init(&manager->events.destroy); wl_signal_init(&manager->events.destroy);
wl_signal_init(&manager->events.new_request); wl_signal_init(&manager->events.capture_request);
manager->display_destroy.notify = foreign_toplevel_manager_handle_display_destroy; manager->display_destroy.notify = foreign_toplevel_manager_handle_display_destroy;
wl_display_add_destroy_listener(display, &manager->display_destroy); wl_display_add_destroy_listener(display, &manager->display_destroy);