[client,x11] fix a possible deadlock on desktop resize

This commit is contained in:
akallabeth 2024-08-20 12:39:35 +02:00
parent ddde8f26e8
commit dcbeedb4d4
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5

View File

@ -458,12 +458,14 @@ static BOOL xf_sw_desktop_resize(rdpContext* context)
xfContext* xfc = (xfContext*)context;
rdpSettings* settings = context->settings;
BOOL ret = FALSE;
xf_lock_x11(xfc);
if (!gdi_resize(gdi, freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth),
freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight)))
goto out;
return FALSE;
/* Do not lock during gdi_resize, there might still be drawing operations in progress.
* locking will deadlock. */
xf_lock_x11(xfc);
if (xfc->image)
{
xfc->image->data = NULL;