morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11661 from akallabeth/sdl-clip-leak

Browse Source 
[client,sdl] fix clipboard leak
This commit is contained in:
akallabeth
2025-06-05 10:49:42 +02:00
committed by GitHub
parent fbd7246dcc dbeda8e568
commit b4a952ce7e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/SDL/SDL3/sdl_channels.cpp
View File

@@ -70,6 +70,7 @@ void sdl_OnChannelDisconnectedEventHandler(void* context, const ChannelDisconnec
{
auto clip = reinterpret_cast<CliprdrClientContext*>(e->pInterface);
WINPR_ASSERT(clip);
(void)sdl->clip.uninit(clip);
clip->custom = nullptr;
}
else if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) == 0)

9
client/SDL/SDL3/sdl_freerdp.cpp
View File

@@ -1161,10 +1161,6 @@ static void sdl_post_disconnect(freerdp* instance)
auto sdl = get_context(instance->context);
sdl->setConnected(false);
PubSub_UnsubscribeChannelConnected(instance->context->pubSub,
sdl_OnChannelConnectedEventHandler);
PubSub_UnsubscribeChannelDisconnected(instance->context->pubSub,
sdl_OnChannelDisconnectedEventHandler);
gdi_free(instance);
}
@@ -1175,6 +1171,11 @@ static void sdl_post_final_disconnect(freerdp* instance)
if (!instance->context)
return;
PubSub_UnsubscribeChannelConnected(instance->context->pubSub,
sdl_OnChannelConnectedEventHandler);
PubSub_UnsubscribeChannelDisconnected(instance->context->pubSub,
sdl_OnChannelDisconnectedEventHandler);
}
static void sdl_client_cleanup(SdlContext* sdl, int exit_code, const std::string& error_msg)