[evolution-mapi] Bug #643781 - Crash accepting meeting requests



commit 07ee5f454358f9fbf52dd0acb2a4b88889554f76
Author: Sean Finney <seanius seanius net>
Date:   Fri Mar 4 08:45:54 2011 +0100

    Bug #643781 - Crash accepting meeting requests

 src/libexchangemapi/exchange-mapi-cal-utils.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/src/libexchangemapi/exchange-mapi-cal-utils.c b/src/libexchangemapi/exchange-mapi-cal-utils.c
index 65ea88e..28d9d26 100644
--- a/src/libexchangemapi/exchange-mapi-cal-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-utils.c
@@ -1467,12 +1467,17 @@ exchange_mapi_cal_utils_write_props_cb (ExchangeMapiConnection *conn, mapi_id_t
 	flag32 = prop ? get_imp_prop_from_priority (icalproperty_get_priority (prop)) : IMPORTANCE_NORMAL;
 	set_value (PR_IMPORTANCE, &flag32);
 
-	set_value (PR_SENT_REPRESENTING_NAME_UNICODE, cbdata->ownername);
-	set_value (PR_SENT_REPRESENTING_ADDRTYPE_UNICODE, cbdata->owneridtype);
-	set_value (PR_SENT_REPRESENTING_EMAIL_ADDRESS_UNICODE, cbdata->ownerid);
-	set_value (PR_SENDER_NAME_UNICODE, cbdata->username);
-	set_value (PR_SENDER_ADDRTYPE_UNICODE, cbdata->useridtype);
-	set_value (PR_SENDER_EMAIL_ADDRESS_UNICODE, cbdata->userid);
+	if (cbdata->ownername && cbdata->owneridtype && cbdata->ownerid) {
+		set_value (PR_SENT_REPRESENTING_NAME_UNICODE, cbdata->ownername);
+		set_value (PR_SENT_REPRESENTING_ADDRTYPE_UNICODE, cbdata->owneridtype);
+		set_value (PR_SENT_REPRESENTING_EMAIL_ADDRESS_UNICODE, cbdata->ownerid);
+	}
+
+	if (cbdata->username && cbdata->useridtype && cbdata->userid) {
+		set_value (PR_SENDER_NAME_UNICODE, cbdata->username);
+		set_value (PR_SENDER_ADDRTYPE_UNICODE, cbdata->useridtype);
+		set_value (PR_SENDER_EMAIL_ADDRESS_UNICODE, cbdata->userid);
+	}
 
 	flag32 = cbdata->msgflags;
 	set_value (PR_MESSAGE_FLAGS, &flag32);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]