From: Norbert Federa <norbert.federa@thincast.com>
Date: Mon, 25 May 2015 20:21:53 +0000 (+0200)
Subject: client/iOS: fix ios_context_new
X-Git-Tag: 2.0.0-beta1+android10~541^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a53e5ee686df2cc32dfcc2956153abddf55bafd;p=platform%2Fupstream%2Ffreerdp.git

client/iOS: fix ios_context_new

- fixed wrong signature since ContextNew is BOOL now
- added error checking
---

diff --git a/client/iOS/FreeRDP/ios_freerdp.m b/client/iOS/FreeRDP/ios_freerdp.m
index 6a9dc21..d309fa6 100644
--- a/client/iOS/FreeRDP/ios_freerdp.m
+++ b/client/iOS/FreeRDP/ios_freerdp.m
@@ -235,18 +235,33 @@ int ios_run_freerdp(freerdp* instance)
 #pragma mark -
 #pragma mark Context callbacks
 
-int ios_context_new(freerdp* instance, rdpContext* context)
+BOOL ios_context_new(freerdp* instance, rdpContext* context)
 {
-	mfInfo* mfi = (mfInfo*)calloc(1, sizeof(mfInfo));
-	((mfContext*) context)->mfi = mfi;
-	context->channels = freerdp_channels_new();
-	ios_events_create_pipe(mfi);
+	mfInfo* mfi;
+
+	if (!(mfi = (mfInfo*)calloc(1, sizeof(mfInfo))))
+		goto fail_mfi;
+
+	if (!(context->channels = freerdp_channels_new()))
+		goto fail_channels;
 	
+	if (!ios_events_create_pipe(mfi))
+		goto fail_events;
+
+	((mfContext*) context)->mfi = mfi;
 	mfi->_context = context;
 	mfi->context = (mfContext*)context;
 	mfi->context->settings = instance->settings;
 	mfi->instance = instance;
-	return 0;
+	return TRUE;
+
+fail_events:
+	freerdp_channels_free(context->channels);
+	context->channels = NULL;
+fail_channels:
+	free(mfi);
+fail_mfi:
+	return FALSE;
 }
 
 void ios_context_free(freerdp* instance, rdpContext* context)