From: Armin Novak <armin.novak@thincast.com>
Date: Tue, 26 Apr 2016 07:34:12 +0000 (+0200)
Subject: ListDictionary handle NULL list argument.
X-Git-Tag: 2.0.0-beta1+android10~238^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee186bec73cdbef90dd2716322ec57b01320e1c0;p=platform%2Fupstream%2Ffreerdp.git

ListDictionary handle NULL list argument.
---

diff --git a/winpr/libwinpr/utils/collections/ListDictionary.c b/winpr/libwinpr/utils/collections/ListDictionary.c
index b8cf90f..40cb72b 100644
--- a/winpr/libwinpr/utils/collections/ListDictionary.c
+++ b/winpr/libwinpr/utils/collections/ListDictionary.c
@@ -45,6 +45,9 @@ int ListDictionary_Count(wListDictionary* listDictionary)
 	int count = 0;
 	wListDictionaryItem* item;
 
+	if (!listDictionary)
+		return -1;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -98,6 +101,9 @@ BOOL ListDictionary_IsSynchronized(wListDictionary* listDictionary)
 
 void ListDictionary_Lock(wListDictionary* listDictionary)
 {
+	if (!listDictionary)
+		return;
+
 	EnterCriticalSection(&listDictionary->lock);
 }
 
@@ -107,6 +113,9 @@ void ListDictionary_Lock(wListDictionary* listDictionary)
 
 void ListDictionary_Unlock(wListDictionary* listDictionary)
 {
+	if (!listDictionary)
+		return;
+
 	LeaveCriticalSection(&listDictionary->lock);
 }
 
@@ -187,6 +196,9 @@ BOOL ListDictionary_Add(wListDictionary* listDictionary, void* key, void* value)
 	wListDictionaryItem* lastItem;
 	BOOL ret = FALSE;
 
+	if (!listDictionary)
+		return FALSE;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -230,6 +242,9 @@ void ListDictionary_Clear(wListDictionary* listDictionary)
 	wListDictionaryItem* item;
 	wListDictionaryItem* nextItem;
 
+	if (!listDictionary)
+		return;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -267,6 +282,9 @@ BOOL ListDictionary_Contains(wListDictionary* listDictionary, void* key)
 	wListDictionaryItem* item;
 	OBJECT_EQUALS_FN keyEquals;
 
+	if (!listDictionary)
+		return FALSE;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&(listDictionary->lock));
 
@@ -298,6 +316,9 @@ void* ListDictionary_Remove(wListDictionary* listDictionary, void* key)
 	wListDictionaryItem* prevItem;
 	OBJECT_EQUALS_FN keyEquals;
 
+	if (!listDictionary)
+		return NULL;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -338,6 +359,9 @@ void *ListDictionary_Remove_Head(wListDictionary* listDictionary)
 	wListDictionaryItem* item;
 	void *value = NULL;
 
+	if (!listDictionary)
+		return NULL;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -364,6 +388,9 @@ void* ListDictionary_GetItemValue(wListDictionary* listDictionary, void* key)
 	wListDictionaryItem* item = NULL;
 	OBJECT_EQUALS_FN keyEquals;
 
+	if (!listDictionary)
+		return NULL;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);
 
@@ -400,6 +427,9 @@ BOOL ListDictionary_SetItemValue(wListDictionary* listDictionary, void* key, voi
 	wListDictionaryItem* item;
 	OBJECT_EQUALS_FN keyEquals;
 
+	if (!listDictionary)
+		return FALSE;
+
 	if (listDictionary->synchronized)
 		EnterCriticalSection(&listDictionary->lock);