[evolution-mapi/gnome-3-0] Bug #653489 - QueryRows fails on exchange 2010 server

[Milan Crha <mcrha src gnome org>]

commit c5f83e7d275f479bb87afa1cd1c541910e997098
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 29 11:08:48 2011 +0200

    Bug #653489 - QueryRows fails on exchange 2010 server

 src/libexchangemapi/exchange-mapi-connection.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index 1581bef..a9c9a28 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -942,6 +942,9 @@ exchange_mapi_util_delete_attachments (mapi_object_t *obj_message, GError **perr
 		goto cleanup;
 	}
 
+	if (!attach_count)
+		goto cleanup;
+
 	ms = QueryRows (&obj_tb_attach, attach_count, TBL_ADVANCE, &rows_attach);
 	if (ms != MAPI_E_SUCCESS) {
 		make_mapi_error (perror, "QueryRows", ms);
@@ -1222,6 +1225,9 @@ exchange_mapi_util_get_attachments (ExchangeMapiConnection *conn, mapi_id_t fid,
 		goto cleanup;
 	}
 
+	if (!attach_count)
+		goto cleanup;
+
 	ms = QueryRows (&obj_tb_attach, attach_count, TBL_ADVANCE, &rows_attach);
 	if (ms != MAPI_E_SUCCESS) {
 		make_mapi_error (perror, "QueryRows", ms);
@@ -1619,6 +1625,9 @@ exchange_mapi_connection_check_restriction (ExchangeMapiConnection *conn, mapi_i
 		goto cleanup;
 	}
 
+	if (!count)
+		goto cleanup;
+
 	/* Fill the table columns with data from the rows */
 	ms = QueryRows (&obj_table, count, TBL_ADVANCE, &SRowSet);
 	if (ms != MAPI_E_SUCCESS) {
@@ -1732,6 +1741,9 @@ exchange_mapi_connection_fetch_items   (ExchangeMapiConnection *conn, mapi_id_t
 			goto cleanup;
 		}
 
+		if (!count)
+			break;
+
 		/* Fill the table columns with data from the rows */
 		ms = QueryRows (&obj_table, count, TBL_ADVANCE, &SRowSet);
 		if (ms != MAPI_E_SUCCESS) {
@@ -3134,6 +3146,9 @@ get_child_folders (TALLOC_CTX *mem_ctx, ExchangeMAPIFolderCategory folder_hier,
 			goto cleanup;
 		}
 
+		if (!count)
+			break;
+
 		/* Fill the table columns with data from the rows */
 		ms = QueryRows (&obj_table, 100, TBL_ADVANCE, &rowset);
 		if (ms != MAPI_E_SUCCESS) {