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

rdp: Don't release the singleton output on backend creation failure

Browse Source 
If an output exists, it should be cleaned up automatically when we release
all our heads later anyway.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2022-08-03 11:29:53 -05:00 committed by Daniel Stone
parent ac11926c61
commit 6f2ab50405
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libweston/backend-rdp/rdp.c
View File

@ -1762,13 +1762,13 @@ rdp_backend_create(struct weston_compositor *compositor,
fd_str = getenv("RDP_FD"); fd_str = getenv("RDP_FD");
if (!fd_str) { if (!fd_str) {
weston_log("RDP_FD env variable not set\n"); weston_log("RDP_FD env variable not set\n");
goto err_output; goto err_compositor;
} }
fd = strtoul(fd_str, &fd_tail, 10); fd = strtoul(fd_str, &fd_tail, 10);
if (errno != 0 || fd_tail == fd_str || *fd_tail != '\0' if (errno != 0 || fd_tail == fd_str || *fd_tail != '\0'
|| rdp_peer_init(freerdp_peer_new(fd), b)) || rdp_peer_init(freerdp_peer_new(fd), b))
goto err_output; goto err_compositor;
} }
ret = weston_plugin_api_register(compositor, WESTON_RDP_OUTPUT_API_NAME, ret = weston_plugin_api_register(compositor, WESTON_RDP_OUTPUT_API_NAME,
@ -1783,9 +1783,6 @@ rdp_backend_create(struct weston_compositor *compositor,
err_listener: err_listener:
freerdp_listener_free(b->listener); freerdp_listener_free(b->listener);
err_output:
if (b->output)
weston_output_release(&b->output->base);
err_compositor: err_compositor:
wl_list_for_each_safe(base, next, &compositor->head_list, compositor_link) { wl_list_for_each_safe(base, next, &compositor->head_list, compositor_link) {
if (to_rdp_head(base)) if (to_rdp_head(base))