--- a/emailservices/emailclientapi/src/emailfolder.cpp Tue Apr 27 16:20:14 2010 +0300
+++ b/emailservices/emailclientapi/src/emailfolder.cpp Tue May 11 15:57:15 2010 +0300
@@ -178,11 +178,13 @@
const CFSMailFolder* fsfolder = folders[i];
const TEntryId id = fsfolder->GetFolderId().Id();
const TFolderId folderId( id, iFolderId.iMailboxId.iId );
- MEmailFolder* folder = CEmailFolder::NewL( iPluginData, folderId, folders[i]);
+ MEmailFolder* folder = CEmailFolder::NewLC( iPluginData, folderId, folders[i]);
aSubfolders.AppendL( folder );
+ CleanupStack::Pop( folder ); // asubfolders took ownership
+ folders[i] = NULL;
}
- CleanupStack::Pop(); // folders
- folders.Close();
+ CleanupStack::Pop( &folders ); // folders
+ folders.Close(); // aSubfolders took ownership
return res;
}