From 6f2ab504056140e7e6b01a63f65b1fbae82f6287 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 3 Aug 2022 11:29:53 -0500 Subject: [PATCH] rdp: Don't release the singleton output on backend creation failure If an output exists, it should be cleaned up automatically when we release all our heads later anyway. Signed-off-by: Derek Foreman --- libweston/backend-rdp/rdp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libweston/backend-rdp/rdp.c b/libweston/backend-rdp/rdp.c index e0e87230..52dc6165 100644 --- a/libweston/backend-rdp/rdp.c +++ b/libweston/backend-rdp/rdp.c @@ -1762,13 +1762,13 @@ rdp_backend_create(struct weston_compositor *compositor, fd_str = getenv("RDP_FD"); if (!fd_str) { weston_log("RDP_FD env variable not set\n"); - goto err_output; + goto err_compositor; } fd = strtoul(fd_str, &fd_tail, 10); if (errno != 0 || fd_tail == fd_str || *fd_tail != '\0' || 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, @@ -1783,9 +1783,6 @@ rdp_backend_create(struct weston_compositor *compositor, err_listener: freerdp_listener_free(b->listener); -err_output: - if (b->output) - weston_output_release(&b->output->base); err_compositor: wl_list_for_each_safe(base, next, &compositor->head_list, compositor_link) { if (to_rdp_head(base))