mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11: reorder xf_post_disconnect 

Channels like EGFX need resources like the main window in order to
work correctly. Before the window, GDI,.. is freed it needs to be
ensured that all channels are stopped properly to prevent them to access
already freed resources. Disconnecting the channels first fixed a
possible race condition/SEGFAULT that could occur with remote initiated
disconnects.
This commit is contained in:
Bernhard Miklautz 2015-07-14 15:28:55 +02:00
parent e2b4bf699e
commit f589d5d6e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/xf_client.c
View File

@ -1195,6 +1195,8 @@ static void xf_post_disconnect(freerdp* instance)
context = instance->context;
xfc = (xfContext*) context;
freerdp_channels_disconnect(context->channels, instance);
gdi_free(instance);
if (xfc->clipboard)
@ -1212,8 +1214,6 @@ static void xf_post_disconnect(freerdp* instance)
}
xf_keyboard_free(xfc);
freerdp_channels_disconnect(context->channels, instance);
}
/** Callback set in the rdp_freerdp structure, and used to get the user's password,