[PATCH 2/2] [rdp compositor] Fix crash when using RDP4 security
David FORT
rdp.effort at gmail.com
Mon Jul 20 05:39:21 PDT 2015
The initialization of the freerdp_peer was done too early.
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=91390.
---
src/compositor-rdp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
index 70d290b..4ef0dd1 100644
--- a/src/compositor-rdp.c
+++ b/src/compositor-rdp.c
@@ -1090,8 +1090,6 @@ rdp_peer_init(freerdp_peer *client, struct rdp_backend *b)
peerCtx = (RdpPeerContext *) client->context;
peerCtx->rdpBackend = b;
- client->Initialize(client);
-
settings = client->settings;
/* configure security settings */
if (b->rdp_key)
@@ -1104,6 +1102,8 @@ rdp_peer_init(freerdp_peer *client, struct rdp_backend *b)
}
settings->NlaSecurity = FALSE;
+ client->Initialize(client);
+
settings->OsMajorType = OSMAJORTYPE_UNIX;
settings->OsMinorType = OSMINORTYPE_PSEUDO_XSERVER;
settings->ColorDepth = 32;
@@ -1113,6 +1113,7 @@ rdp_peer_init(freerdp_peer *client, struct rdp_backend *b)
settings->FrameMarkerCommandEnabled = TRUE;
settings->SurfaceFrameMarkerEnabled = TRUE;
+
client->Capabilities = xf_peer_capabilities;
client->PostConnect = xf_peer_post_connect;
client->Activate = xf_peer_activate;
--
1.9.1
More information about the wayland-devel
mailing list