maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-935: Do not assign SVC plugin context as it may be automatically freed.

Browse Source 
FreeRDP version 2.0.0-rc0 and older will automatically free whatever
entry_points->pInterface is set to when the channel plugin is unloaded.
This doesn't happen in later versions, but will result in a double-free
upon disconnect for 2.0.0-rc0 in our case. As we don't need pInterface,
we can safely set this to NULL and avoid the issue entirely.
This commit is contained in:
Michael Jumper 2020-01-22 11:10:45 -08:00
parent 3bc00c429a
commit 8ebe5c571a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
View File

@ -294,7 +294,7 @@ BOOL VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX entry_points,
svc->_init_handle = init_handle;
/* Complete initialization */
if (svc->_entry_points.pVirtualChannelInitEx(svc, svc, init_handle,
if (svc->_entry_points.pVirtualChannelInitEx(svc, NULL, init_handle,
&svc->_channel_def, 1, VIRTUAL_CHANNEL_VERSION_WIN2000,
guac_rdp_common_svc_handle_init_event) != CHANNEL_RC_OK) {
return FALSE;