From e5a39484683d0d6c2196e276b53fbd439e8ec237 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 16 Aug 2012 16:30:58 +0000 Subject: [PATCH] Monotone-Parent: 586a2e5adebfaf2123f3514dffa057f7f0f0574e Monotone-Revision: 8dee72c8fdafae92791aa552c3705e9c68f5c59e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-08-16T16:30:58 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreMapping.m | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 927be6402..f030d098f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-08-16 Wolfgang Sourdeau + * OpenChange/MAPIStoreMapping.m (_updateFolderWithURL:withURL:): + we retain and release "oldURL" to avoid releasing it when it + is replaced in the list of urls to modify. + * OpenChange/MAPIStoreAppointmentWrapper.m (-getPidTagInternetCodepage:inMemCtx:): new getter for a property that is sometimes requested. diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m index 36c4dc9a3..448ef1d1b 100644 --- a/OpenChange/MAPIStoreMapping.m +++ b/OpenChange/MAPIStoreMapping.m @@ -215,6 +215,8 @@ MAPIStoreMappingTDBTraverse (TDB_CONTEXT *ctx, TDB_DATA data1, TDB_DATA data2, NSNumber *idKey; TDB_DATA key, dbuf; + [oldURL retain]; + allKeys = [reverseMapping allKeys]; max = [allKeys count]; for (count = 0; count < max; count++) @@ -243,6 +245,8 @@ MAPIStoreMappingTDBTraverse (TDB_CONTEXT *ctx, TDB_DATA data1, TDB_DATA data2, talloc_free (dbuf.dptr); } } + + [oldURL release]; } - (void) updateID: (uint64_t) idNbr