From 3a4bda43a1378383a872d5f6c38b0ccbcd9d837a Mon Sep 17 00:00:00 2001
From: bradh <bradh@71d39326-ef09-db11-b2a4-00e04c779ad1>
Date: Sat, 22 Jan 2011 21:54:26 +0000
Subject: [PATCH] Merge r2528 and r2529 from mapistore_v2 branch.

This are small changes to protect against problems running mapitest, but are generally useful.


git-svn-id: https://svn.openchange.org/openchange@2538 71d39326-ef09-db11-b2a4-00e04c779ad1
---
 trunk/libmapi/property.c                      | 11 +++++++++++
 trunk/utils/mapitest/modules/module_nspi.c    |  9 +++++++++
 trunk/utils/mapitest/modules/module_oxcfold.c |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/trunk/libmapi/property.c b/trunk/libmapi/property.c
index de6a173e..915681bd 100644
--- a/trunk/libmapi/property.c
+++ b/trunk/libmapi/property.c
@@ -236,6 +236,10 @@ _PUBLIC_ const void *find_SPropValue_data(struct SRow *aRow, uint32_t mapitag)
 {
 	uint32_t i;
 
+	if ( ! aRow) {
+		return NULL;
+	}
+
 	for (i = 0; i < aRow->cValues; i++) {
 		if (aRow->lpProps[i].ulPropTag == mapitag) {
 			return get_SPropValue_data(&(aRow->lpProps[i]));
@@ -249,6 +253,10 @@ _PUBLIC_ const void *find_mapi_SPropValue_data(
 {
 	uint32_t i;
 
+	if ( ! properties) {
+		return NULL;
+	}
+
 	for (i = 0; i < properties->cValues; i++) {
 		if (properties->lpProps[i].ulPropTag == mapitag) {
 			return get_mapi_SPropValue_data(&properties->lpProps[i]);
@@ -259,6 +267,9 @@ _PUBLIC_ const void *find_mapi_SPropValue_data(
 
 _PUBLIC_ const void *get_mapi_SPropValue_data(struct mapi_SPropValue *lpProp)
 {
+	if ( ! lpProp) {
+		return NULL;
+	}
 	if (lpProp->ulPropTag == 0) {
 		return NULL;
 	}
diff --git a/trunk/utils/mapitest/modules/module_nspi.c b/trunk/utils/mapitest/modules/module_nspi.c
index b6df8dc9..b50d25be 100644
--- a/trunk/utils/mapitest/modules/module_nspi.c
+++ b/trunk/utils/mapitest/modules/module_nspi.c
@@ -969,6 +969,15 @@ _PUBLIC_ bool mapitest_nspi_ResolveNames(struct mapitest *mt)
 	/* NspiResolveNames (0x13) */
 	retval = ResolveNames(mt->session, (const char **)username, SPropTagArray, &SRowSet, &flaglist, 0);
 	mapitest_print_retval_clean(mt, "NspiResolveNames - existing", retval);
+	if (retval != MAPI_E_SUCCESS) {
+		MAPIFreeBuffer(SPropTagArray);
+		return false;
+	}
+	if ( ! flaglist) {
+		mapitest_print(mt, "\tNULL flaglist, which wasn't expected\n");
+		MAPIFreeBuffer(SPropTagArray);
+		return false;
+	}
 	if (flaglist->aulPropTag[0] != MAPI_RESOLVED) {
 		mapitest_print(mt, "Expected 2 (MAPI_RESOLVED), but NspiResolveNames returned: %i\n", flaglist->aulPropTag[0]);
 	} else {
diff --git a/trunk/utils/mapitest/modules/module_oxcfold.c b/trunk/utils/mapitest/modules/module_oxcfold.c
index c15d034b..4a66e773 100644
--- a/trunk/utils/mapitest/modules/module_oxcfold.c
+++ b/trunk/utils/mapitest/modules/module_oxcfold.c
@@ -985,7 +985,7 @@ _PUBLIC_ bool mapitest_oxcfold_MoveCopyMessages(struct mapitest *mt)
 		mapi_object_init(&obj_message);
 		common_result = mapitest_common_message_create(mt, &obj_folder_src, &obj_message, MT_MAIL_SUBJECT);
 		if (!common_result) {
-			mapitest_print(mt, "* mapitest_common_message_create() failed");
+			mapitest_print(mt, "* mapitest_common_message_create() failed\n");
 			ret = false;
 			goto release;
 		}
-- 
2.34.1