Attachment 690374 Details for Bug 905591 – evolution-mapi-0.28.3-exchange2010-2.patch

[patch] evolution-mapi-0.28.3-exchange2010-2.patch

evolution-mapi-0.28.3-exchange2010-2.patch (text/plain), 6.72 KB, created by Milan Crha on 2013-01-30 13:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2013-01-30 13:06:05 UTC

Size: 6.72 KB

patch

obsolete

>diff -up evolution-mapi-0.28.3/src/libexchangemapi/exchange-mapi-connection.c.exchange2010-2 evolution-mapi-0.28.3/src/libexchangemapi/exchange-mapi-connection.c
>--- evolution-mapi-0.28.3/src/libexchangemapi/exchange-mapi-connection.c.exchange2010-2	2013-01-30 12:59:59.968413754 +0100
>+++ evolution-mapi-0.28.3/src/libexchangemapi/exchange-mapi-connection.c	2013-01-30 13:00:16.356534875 +0100
>@@ -575,6 +575,9 @@ exchange_mapi_util_delete_attachments (m
> 		goto cleanup;
> 	}
> 
>+	if (!attach_count)
>+		goto cleanup;
>+
> 	retval = QueryRows(&obj_tb_attach, attach_count, TBL_ADVANCE, &rows_attach);
> 	if (retval != MAPI_E_SUCCESS) {
> 		mapi_errstr("QueryRows", GetLastError());
>@@ -709,6 +712,9 @@ exchange_mapi_util_get_attachments (mapi
> 		goto cleanup;
> 	}
> 
>+	if (!attach_count)
>+		goto cleanup;
>+
> 	retval = QueryRows(&obj_tb_attach, attach_count, TBL_ADVANCE, &rows_attach);
> 	if (retval != MAPI_E_SUCCESS) {
> 		mapi_errstr("QueryRows", GetLastError());
>@@ -1122,6 +1128,9 @@ exchange_mapi_util_check_restriction (ma
> 		goto cleanup;
> 	}
> 
>+	if (!count)
>+		goto cleanup;
>+
> 	/* Fill the table columns with data from the rows */
> 	retval = QueryRows(&obj_table, count, TBL_ADVANCE, &SRowSet);
> 	if (retval != MAPI_E_SUCCESS) {
>@@ -1162,7 +1171,7 @@ exchange_mapi_connection_fetch_items   (
> 	mapi_object_t obj_store;
> 	mapi_object_t obj_folder;
> 	mapi_object_t obj_table;
>-	struct SPropTagArray *SPropTagArray, *GetPropsTagArray;
>+	struct SPropTagArray *SPropTagArray, *GetPropsTagArray = NULL;
> 	struct SRowSet SRowSet;
> 	uint32_t count, i, cursor_pos = 0;
> 	gboolean result = FALSE;
>@@ -1198,9 +1207,6 @@ exchange_mapi_connection_fetch_items   (
> 		goto cleanup;
> 	}
> 
>-	GetPropsTagArray = talloc_zero(mem_ctx, struct SPropTagArray);
>-	GetPropsTagArray->cValues = 0;
>-
> 	SPropTagArray = set_SPropTagArray(mem_ctx, 0x4,
> 					  PR_FID,
> 					  PR_MID,
>@@ -1231,6 +1237,53 @@ exchange_mapi_connection_fetch_items   (
> 		}
> 	}
> 
>+	if ((GetPropsList && (cn_props > 0)) || build_name_id) {
>+		struct SPropTagArray *NamedPropsTagArray;
>+		uint32_t m;
>+		struct mapi_nameid *nameid;
>+
>+		nameid = mapi_nameid_new(mem_ctx);
>+		NamedPropsTagArray = talloc_zero(mem_ctx, struct SPropTagArray);
>+
>+		NamedPropsTagArray->cValues = 0;
>+		/* Add named props using callback */
>+		if (build_name_id) {
>+			if (!build_name_id (nameid, build_name_data)) {
>+				g_warning ("\n%s: (%s): Could not build named props ",
>+						G_STRLOC, G_STRFUNC);
>+				goto GetProps_cleanup;
>+			}
>+
>+			retval = mapi_nameid_GetIDsFromNames(nameid, &obj_folder, NamedPropsTagArray);
>+			if (retval != MAPI_E_SUCCESS) {
>+				mapi_errstr("mapi_nameid_GetIDsFromNames", GetLastError());
>+				goto GetProps_cleanup;
>+			}
>+		}
>+
>+	GetProps_cleanup:
>+		for (m = 0; m < NamedPropsTagArray->cValues; m++) {
>+			if (G_UNLIKELY (!GetPropsTagArray))
>+				GetPropsTagArray = set_SPropTagArray (mem_ctx, 0x1,
>+								      NamedPropsTagArray->aulPropTag[m]);
>+			else
>+				SPropTagArray_add (mem_ctx, GetPropsTagArray,
>+						   NamedPropsTagArray->aulPropTag[m]);
>+		}
>+
>+		for (m = 0; m < cn_props; m++) {
>+			if (G_UNLIKELY (!GetPropsTagArray))
>+				GetPropsTagArray = set_SPropTagArray (mem_ctx, 0x1,
>+								      GetPropsList[m]);
>+			else
>+				SPropTagArray_add (mem_ctx, GetPropsTagArray,
>+						   GetPropsList[m]);
>+		}
>+
>+		MAPIFreeBuffer (NamedPropsTagArray);
>+		talloc_free (nameid);
>+	}
>+
> 	/* Note : We maintain a cursor position. count parameter in QueryRows */
> 	/* is more of a request and not gauranteed  */
> 	do {
>@@ -1241,6 +1294,9 @@ exchange_mapi_connection_fetch_items   (
> 			goto cleanup;
> 		}
> 
>+		if (!count)
>+			break;
>+
> 		/* Fill the table columns with data from the rows */
> 		retval = QueryRows(&obj_table, count, TBL_ADVANCE, &SRowSet);
> 		if (retval != MAPI_E_SUCCESS) {
>@@ -1248,44 +1304,6 @@ exchange_mapi_connection_fetch_items   (
> 			goto cleanup;
> 		}
> 
>-		if ((GetPropsList && (cn_props > 0)) || build_name_id) {
>-			struct SPropTagArray *NamedPropsTagArray;
>-			uint32_t m, n=0;
>-			struct mapi_nameid *nameid;
>-
>-			nameid = mapi_nameid_new(mem_ctx);
>-			NamedPropsTagArray = talloc_zero(mem_ctx, struct SPropTagArray);
>-
>-			NamedPropsTagArray->cValues = 0;
>-			/* Add named props using callback */
>-			if (build_name_id) {
>-				if (!build_name_id (nameid, build_name_data)) {
>-					g_warning ("\n%s: (%s): Could not build named props ",
>-							G_STRLOC, G_STRFUNC);
>-					goto GetProps_cleanup;
>-				}
>-
>-				retval = mapi_nameid_GetIDsFromNames(nameid, &obj_folder, NamedPropsTagArray);
>-				if (retval != MAPI_E_SUCCESS) {
>-					mapi_errstr("mapi_nameid_GetIDsFromNames", GetLastError());
>-					goto GetProps_cleanup;
>-				}
>-			}
>-
>-			GetPropsTagArray->cValues = (cn_props + NamedPropsTagArray->cValues);
>-			GetPropsTagArray->aulPropTag = talloc_array(mem_ctx, uint32_t, (cn_props + NamedPropsTagArray->cValues));
>-
>-			for (m = 0; m < NamedPropsTagArray->cValues; m++, n++)
>-				GetPropsTagArray->aulPropTag[n] = NamedPropsTagArray->aulPropTag[m];
>-
>-			for (m = 0; m < cn_props; m++, n++)
>-				GetPropsTagArray->aulPropTag[n] = GetPropsList[m];
>-
>-		GetProps_cleanup:
>-			MAPIFreeBuffer (NamedPropsTagArray);
>-			talloc_free (nameid);
>-		}
>-
> 		for (i = 0; i < SRowSet.cRows; i++) {
> 			mapi_object_t obj_message;
> 			struct mapi_SPropValue_array properties_array = {0};
>@@ -1327,7 +1345,7 @@ exchange_mapi_connection_fetch_items   (
> 				exchange_mapi_util_read_body_stream (&obj_message, &stream_list, 
> 								     options & MAPI_OPTIONS_GETBESTBODY);
> 
>-			if (GetPropsTagArray->cValues) {
>+			if (GetPropsTagArray && GetPropsTagArray->cValues) {
> 				struct SPropValue *lpProps;
> 				struct SPropTagArray *tags;
> 				uint32_t prop_count = 0, k;
>@@ -1381,7 +1399,7 @@ exchange_mapi_connection_fetch_items   (
> 				g_free (item_data);
> 			}
> 
>-			if (GetPropsTagArray->cValues) 
>+			if (GetPropsTagArray && GetPropsTagArray->cValues) 
> 				talloc_free (properties_array.lpProps);
> 
> 		loop_cleanup:
>@@ -1396,6 +1414,8 @@ exchange_mapi_connection_fetch_items   (
> 	result = TRUE;
> 
> cleanup:
>+	if (GetPropsTagArray)
>+		MAPIFreeBuffer (GetPropsTagArray);
> 	mapi_object_release(&obj_folder);
> 	mapi_object_release(&obj_table);
> 	mapi_object_release(&obj_store);
>@@ -1479,7 +1499,7 @@ exchange_mapi_connection_fetch_item (map
> 		}
> 
> 		GetPropsTagArray->cValues = (cn_props + NamedPropsTagArray->cValues);
>-		GetPropsTagArray->aulPropTag = talloc_array(mem_ctx, uint32_t, (cn_props + NamedPropsTagArray->cValues));
>+		GetPropsTagArray->aulPropTag = talloc_array(mem_ctx, int32_t, (cn_props + NamedPropsTagArray->cValues));
> 
> 		for (m = 0; m < NamedPropsTagArray->cValues; m++, n++)
> 			GetPropsTagArray->aulPropTag[n] = NamedPropsTagArray->aulPropTag[m];
>@@ -2656,6 +2676,9 @@ get_child_folders(TALLOC_CTX *mem_ctx, E
> 		goto cleanup;
> 	}
> 
>+	if (!row_count)
>+		goto cleanup;
>+
> 	SPropTagArray = set_SPropTagArray(mem_ctx, 0x7,
> 					  PR_FID,
> 					  PR_CONTAINER_CLASS,

Actions: View | Diff

Attachments on bug 905591: 690374