--- a/metadataengine/client/src/mdeharvestersession.cpp Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/client/src/mdeharvestersession.cpp Fri Sep 17 16:54:49 2010 +0300
@@ -45,6 +45,7 @@
{
iHarvestingPrioritizationChunk.Close();
delete iHarvestingPrioritizationSerializationBuffer;
+ iHarvestingPrioritizationSerializationBuffer = NULL;
}
void CMdEHarvesterSession::ConstructL()
@@ -112,12 +113,20 @@
}
// Note: CopyLC doesn't push anything to cleanup stack
- uri->Des().CopyLC( aUri );
+ TRAPD(err, uri->Des().CopyLC( aUri ));
+ if(err != KErrNone)
+ {
+ delete uri;
+ uri = NULL;
+ return EFalse;
+ }
+
const TBool ret = iSession->EngineSession().DoSetFileToPresent(
- aMediaId, *uri, aFileInfo );
+ aMediaId, *uri, aFileInfo );
delete uri;
+ uri = NULL;
return ret;
}
@@ -129,8 +138,10 @@
WRITELOG( "CMdEHarvesterSession::SetFilesToPresentL -- Start" );
if( aUris.Count() != aFileInfos.Count() )
{
+#ifdef _DEBUG
WRITELOG2( "CMdEHarvesterSession::SetFilesToPresentL -- Leave (%d, %d)",
aUris.Count(), aFileInfos.Count() );
+#endif
User::Leave( KErrArgument );
}