diff -r 0d28c1c5b6dd -r 2828b4d142c0 phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp Tue Apr 27 16:23:35 2010 +0300 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp Tue May 11 16:00:21 2010 +0300 @@ -235,11 +235,13 @@ RPointerArray& aAddressFields ) { __ASSERT_ALWAYS( iFieldFirst && iFieldSecond, Panic( EPbk2NotChosen ) ); + CleanupClosePushL( aAddressFields ); if ( iChosenField ) { aAddressFields.AppendL( iChosenField ); } + CleanupStack::Pop(); } // -------------------------------------------------------------------------- @@ -385,6 +387,7 @@ { __ASSERT_ALWAYS( iContactChosenAddress, Panic( EPbk2NotChosen ) ); + CleanupClosePushL( aAddressFields ); CPbk2PresentationContactFieldCollection& fields = iContactChosenAddress->PresentationFields(); for( TInt idx = 0; idx < fields.FieldCount(); idx++ ) @@ -396,5 +399,6 @@ aAddressFields.AppendL( &field ); } } + CleanupStack::Pop(); }