fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 06:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

frontend: Assign output before registry shared output init

Browse source 
Set the shared output's Weston output reference before obtaining
the registry from the parent display. Ensures proper access to
output context during registry event handling.

Also prevent weston_seat_init when shared output lacks a compositor,
avoiding crashes on invalid initialization.

Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
This commit is contained in:
Pablo Saavedra 2025-06-09 12:40:18 +02:00 • committed by Marius Vlad
parent fc3e3cf653
commit c0dfeaf156
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frontend/screen-share.c
View file

@ -371,7 +371,13 @@ ss_seat_create(struct shared_output *so, uint32_t id)
if (seat == NULL)
return NULL;
weston_seat_init(&seat->base, so->output->compositor, "screen-share");
if (so->output) {
weston_seat_init(&seat->base, so->output->compositor, "screen-share");
} else {
weston_log("Skip seat creation the screen share output has not an output compositor\n");
return NULL;
}
seat->output = so;
seat->id = id;
seat->parent.seat = wl_registry_bind(so->parent.registry, id,
@ -970,6 +976,8 @@ shared_output_create(struct weston_output *output, struct screen_share *ss, int
if (!so->parent.display)
goto err_alloc;
/* Set Weston output reference in the shared output before registry */
so->output = output;
so->parent.registry = wl_display_get_registry(so->parent.display);
if (!so->parent.registry)
goto err_display;
@ -1033,7 +1041,6 @@ shared_output_create(struct weston_output *output, struct screen_share *ss, int
wl_list_init(&so->shm.buffers);
wl_list_init(&so->shm.free_buffers);
so->output = output;
so->output_destroyed.notify = output_destroyed;
wl_signal_add(&so->output->destroy_signal, &so->output_destroyed);