From 830a3687b924d587db5f2073057700ed7e1e68f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 9 Aug 2012 21:34:27 +0000 Subject: [PATCH] Monotone-Parent: af0fb5901615e40ad3549c59f74f88bb33f9b392 Monotone-Revision: 5a88c883713608f144b55bfcc8139174ad4ab129 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-08-09T21:34:27 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 ++ OpenChange/MAPIStoreSOGo.m | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f10711b10..b04463fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * OpenChange/MAPIStoreSOGo.m (sogo_folder_move_folder) (sogo_folder_copy_folder): new backend methods. + (sogo_folder_move_folder): do not instantiate an NSString from a + NULL "new_folder_name" parameter. 2012-08-08 Wolfgang Sourdeau diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 09dfa596a..aaac2bcf7 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -631,7 +631,10 @@ sogo_folder_move_folder(void *folder_object, void *source_folder_object, GSRegisterCurrentThread (); pool = [NSAutoreleasePool new]; - newFolderName = [NSString stringWithUTF8String: new_folder_name]; + if (new_folder_name) + newFolderName = [NSString stringWithUTF8String: new_folder_name]; + else + newFolderName = nil; rc = [targetFolder moveFolderWithFID: fid fromFolder: sourceFolder