diff -r be41ab7b952f -r 43658d24f35d richcallsettingsengine/rcse2/src/crcseprofileregistry.cpp --- a/richcallsettingsengine/rcse2/src/crcseprofileregistry.cpp Tue May 11 16:04:22 2010 +0300 +++ b/richcallsettingsengine/rcse2/src/crcseprofileregistry.cpp Tue May 25 12:31:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -30,6 +30,8 @@ #include #include +#include + #include "crcseprofileregistry.h" #include "crcseprofileentry.h" #include "crcseaudiocodecregistry.h" @@ -351,6 +353,8 @@ { RCSELOGSTRING( "CRCSEProfileRegistry::FindByServiceIdL() - IN" ); + CleanupResetAndDestroyPushL( aFoundEntries ); + BeginL(); TBuf des; @@ -393,6 +397,8 @@ } EndL(); + + CleanupStack::Pop( &aFoundEntries ); RCSELOGSTRING( "CRCSEProfileRegistry::FindByServiceIdL() - OUT" ); } @@ -407,6 +413,8 @@ RPointerArray& aFoundEntries ) { RCSELOGSTRING( "CRCSEProfileRegistry::FindBySIPProfileIdL() - IN" ); + + CleanupResetAndDestroyPushL( aFoundEntries ); BeginL(); @@ -474,6 +482,8 @@ CleanupStack::PopAndDestroy( &voipIds ); EndL(); + + CleanupStack::Pop( &aFoundEntries ); RCSELOGSTRING( "CRCSEProfileRegistry::FindBySIPProfileIdL() - OUT" ); } @@ -1148,6 +1158,8 @@ void CRCSEProfileRegistry::ExtractProtocoIdsL( const TDesC& aDes, RArray& aArray ) { + CleanupClosePushL( aArray ); + TLex lex( aDes ); TSettingIds value; @@ -1172,7 +1184,9 @@ // Go over the space character. lex.Inc( 1 ); } - } + } + + CleanupStack::Pop( &aArray ); } // -----------------------------------------------------------------------------