diff options
| author | FORT David <rdp.effort@gmail.com> | 2015-07-20 14:39:21 +0200 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-07-23 18:32:23 -0700 |
| commit | b3463a9e9cbd706d7c41143b3cd34be3e701e988 (patch) | |
| tree | 9f296610ed9a28f7bf25c39ff063594f6d1f2ef1 /src/compositor-rdp.c | |
| parent | c2635c659982c864c40ec5836b0304eee79c2d24 (diff) | |
| download | weston-b3463a9e9cbd706d7c41143b3cd34be3e701e988.tar.gz | |
Fix crash when using RDP4 security
The initialization of the freerdp_peer was done too early.
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=91390.
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'src/compositor-rdp.c')
| -rw-r--r-- | src/compositor-rdp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c index 70d290b3..4ef0dd15 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; |