commit 88249cdc281bea5a093d26720bd8a0329dad00c9
author David FORT <rdp.effort@gmail.com> Sun Aug 02 00:35:30 2015 +0200
committer Daniel Stone <daniels@collabora.com> Thu Aug 06 16:11:28 2015 +0100
tree 7a1556b3c3c396c64ebc1f0ff33fb7e5aa797725
parent 82d4925b1a9de104050e4f9b610ce36d096e793f

don't crash when the key file doesn't exist

This allows to close the remaining issue in
https://bugs.freedesktop.org/show_bug.cgi?id=91390

Reviewed-by: Daniel Stone <daniels@collabora.com>

src/compositor-rdp.c

diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
index 869c3f3..049191a 100644
--- a/src/compositor-rdp.c
+++ b/src/compositor-rdp.c
@@ -1113,7 +1113,10 @@
 	}
 	settings->NlaSecurity = FALSE;
 
-	client->Initialize(client);
+	if (!client->Initialize(client)) {
+		weston_log("peer initialization failed\n");
+		goto error_initialize;
+	}
 
 	settings->OsMajorType = OSMAJORTYPE_UNIX;
 	settings->OsMinorType = OSMINORTYPE_PSEUDO_XSERVER;
@@ -1124,7 +1127,6 @@
 	settings->FrameMarkerCommandEnabled = TRUE;
 	settings->SurfaceFrameMarkerEnabled = TRUE;
 
-
 	client->Capabilities = xf_peer_capabilities;
 	client->PostConnect = xf_peer_post_connect;
 	client->Activate = xf_peer_activate;
@@ -1140,7 +1142,7 @@
 
 	if (!client->GetFileDescriptor(client, rfds, &rcount)) {
 		weston_log("unable to retrieve client fds\n");
-		return -1;
+		goto error_initialize;
 	}
 
 	loop = wl_display_get_event_loop(b->compositor->wl_display);
@@ -1155,6 +1157,10 @@
 
 	wl_list_insert(&b->output->peers, &peerCtx->item.link);
 	return 0;
+
+error_initialize:
+	client->Close(client);
+	return -1;
 }
 
 
@@ -1163,7 +1169,7 @@
 {
 	struct rdp_backend *b = (struct rdp_backend *)instance->param4;
 	if (rdp_peer_init(client, b) < 0) {
-		weston_log("error when treating incoming peer");
+		weston_log("error when treating incoming peer\n");
 		FREERDP_CB_RETURN(FALSE);
 	}