From 5426fb4bbb1120c1e2efb222734f8d71245d3809 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 14 Aug 2012 20:16:16 +0000 Subject: [PATCH] Monotone-Parent: 1036da510d0360f1e473b578044e95ac7792871f Monotone-Revision: 0a2405280c040b602d25fea256f5093976a1aa95 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-08-14T20:16:16 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreSOGo.m | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 171a82f9e..5169befd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-08-14 Wolfgang Sourdeau + * OpenChange/MAPIStoreSOGo.m (sogo_folder_move_folder): if + "target_folder_object", we do not attempt to access the + corresponding instance member. + * OpenChange/MAPIStoreMailFolder.m (- moveCopyMessagesWithMIDs:andCount:fromFolder:withMIDs:andChangeKeys:wantCopy:): do not attempt to access targetChangeKeys when NULL, to avoid a diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 276bd6268..38bdd765a 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -626,7 +626,10 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object, moveFolder = wrapper->instance; wrapper = target_folder_object; - targetFolder = wrapper->instance; + if (wrapper) + targetFolder = wrapper->instance; + else + targetFolder = nil; GSRegisterCurrentThread (); pool = [NSAutoreleasePool new];