From 58409406afe7c2a8a71ed2dc8e22075be4f41c0c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 9 Feb 2026 12:58:42 +0100 Subject: [PATCH] [client,X11] fix clipboard update Synchronize channel thread with RDP thread when accessing clipboard formats --- client/X11/xf_cliprdr.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 39b082e2faad..bc4cb753f6c9 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -869,7 +869,11 @@ static void xf_clipboard_formats_free(xfClipboard* clipboard) { WINPR_ASSERT(clipboard); + /* Synchronize RDP/X11 thread with channel thread */ + xf_lock_x11(clipboard->xfc); xf_cliprdr_free_formats(clipboard->lastSentFormats, clipboard->lastSentNumFormats); + xf_unlock_x11(clipboard->xfc); + clipboard->lastSentFormats = NULL; clipboard->lastSentNumFormats = 0; } @@ -1867,24 +1871,23 @@ static UINT xf_cliprdr_send_client_format_list_response(xfClipboard* clipboard, static UINT xf_cliprdr_monitor_ready(CliprdrClientContext* context, const CLIPRDR_MONITOR_READY* monitorReady) { - UINT ret = 0; - xfClipboard* clipboard = NULL; - WINPR_ASSERT(context); WINPR_ASSERT(monitorReady); - clipboard = cliprdr_file_context_get_context(context->custom); + xfClipboard* clipboard = cliprdr_file_context_get_context(context->custom); WINPR_ASSERT(clipboard); WINPR_UNUSED(monitorReady); - if ((ret = xf_cliprdr_send_client_capabilities(clipboard)) != CHANNEL_RC_OK) + const UINT ret = xf_cliprdr_send_client_capabilities(clipboard); + if (ret != CHANNEL_RC_OK) return ret; xf_clipboard_formats_free(clipboard); - if ((ret = xf_cliprdr_send_client_format_list(clipboard, TRUE)) != CHANNEL_RC_OK) - return ret; + const UINT ret2 = xf_cliprdr_send_client_format_list(clipboard, TRUE); + if (ret2 != CHANNEL_RC_OK) + return ret2; clipboard->sync = TRUE; return CHANNEL_RC_OK;