From 63fb2baa8f3e01ce1d9e3b54684bff4c48615c9f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 26 Sep 2011 16:21:03 +0000 Subject: [PATCH] Monotone-Parent: a7de776942b3d74e0380fedb944ee4a08d4037dd Monotone-Revision: 80c8d4e2847b46d0107ef53db2c5605e438d8350 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-09-26T16:21:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OpenChange/MAPIStoreFolder.m | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a7f28876..4cd358e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-09-26 Wolfgang Sourdeau + * OpenChange/MAPIStoreFolder.m + (-moveCopyMessagesWithMID:fromFolder:withMID:wantCopy:): ensure + that "data" is not NULL before passing it to + set_SPropValue_proptag as it might be converted to a PT_ERROR + value. + * SoObjects/Mailer/SOGoDraftObject.m (-sendMailAndCopyToSent:): renamed "sendMail" and made copying the messsage to the sent folder opetional. diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 7a4fd5b07..2b22d9a85 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -605,7 +605,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe error = [sourceMsg getProperty: &data withTag: propTag inMemCtx: aRow]; - if (error == MAPISTORE_SUCCESS) + if (error == MAPISTORE_SUCCESS && data) { set_SPropValue_proptag(&aRow->lpProps[aRow->cValues], propTag, data); aRow->cValues++;