commit a054073ec7adc2bee97deccd914b3e543566e4fb
author Virtually Nick <necouchman@users.noreply.github.com> Wed Jan 22 16:23:38 2020 -0500
committer GitHub <noreply@github.com> Wed Jan 22 16:23:38 2020 -0500
tree 63d89df1168e3a4044cfea6f1335b74eee684349
parent 3bc00c429a99b8a1cadfc52b91e6ecfc4ce50dc5
parent 8ebe5c571a03205b1cbaa0980898001bb01fde65

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

src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c

diff --git a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
index fbba484..535cb45 100644
--- a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
+++ b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
@@ -294,7 +294,7 @@
     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;