From: Armin Novak <armin.novak@thincast.com>
Date: Fri, 28 Aug 2015 08:58:20 +0000 (+0200)
Subject: Fixed NONNULL argument warnings.
X-Git-Tag: 2.0.0-beta1+android10~446^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07bba9b62313f99d44c80c1374570dcb578d7e12;p=platform%2Fupstream%2Ffreerdp.git

Fixed NONNULL argument warnings.
---

diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 9ea678b..8da8957 100644
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -680,21 +680,33 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
 
 		_settings->ChannelCount = settings->ChannelCount;
 		_settings->ChannelDefArraySize = settings->ChannelDefArraySize;
-		_settings->ChannelDefArray = (CHANNEL_DEF*) malloc(sizeof(CHANNEL_DEF) * settings->ChannelDefArraySize);
 
-		if (!_settings->ChannelDefArray && _settings->ChannelDefArraySize)
-			goto out_fail;
+		if (_settings->ChannelDefArraySize > 0)
+		{
+			_settings->ChannelDefArray = (CHANNEL_DEF*) malloc(sizeof(CHANNEL_DEF) * settings->ChannelDefArraySize);
+
+			if (!_settings->ChannelDefArray)
+				goto out_fail;
 
-		CopyMemory(_settings->ChannelDefArray, settings->ChannelDefArray, sizeof(CHANNEL_DEF) * settings->ChannelDefArraySize);
+			CopyMemory(_settings->ChannelDefArray, settings->ChannelDefArray, sizeof(CHANNEL_DEF) * settings->ChannelDefArraySize);
+		}
+		else
+			_settings->ChannelDefArray = NULL;
 
 		_settings->MonitorCount = settings->MonitorCount;
 		_settings->MonitorDefArraySize = settings->MonitorDefArraySize;
-		_settings->MonitorDefArray = (rdpMonitor*) malloc(sizeof(rdpMonitor) * settings->MonitorDefArraySize);
 
-		if (!_settings->MonitorDefArray && _settings->MonitorDefArraySize)
-			goto out_fail;
+		if (_settings->MonitorDefArraySize > 0)
+		{
+			_settings->MonitorDefArray = (rdpMonitor*) malloc(sizeof(rdpMonitor) * settings->MonitorDefArraySize);
+
+			if (!_settings->MonitorDefArray)
+				goto out_fail;
 
-		CopyMemory(_settings->MonitorDefArray, settings->MonitorDefArray, sizeof(rdpMonitor) * settings->MonitorDefArraySize);
+			CopyMemory(_settings->MonitorDefArray, settings->MonitorDefArray, sizeof(rdpMonitor) * settings->MonitorDefArraySize);
+		}
+		else
+			_settings->MonitorDefArray = NULL;
 
 		_settings->MonitorIds = (UINT32*) calloc(16, sizeof(UINT32));
 		if (!_settings->MonitorIds)