diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/source/swis/server/adornedutilities.cpp --- a/installationservices/swi/source/swis/server/adornedutilities.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/source/swis/server/adornedutilities.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -23,6 +23,7 @@ #include "adornedutilities.h" #include "log.h" +#include "cleanuputils.h" _LIT(KAdornedWildCharString, "{????????}"); const TInt Swi::FileNameUnadornedPartLength = 10; @@ -75,6 +76,7 @@ void Swi::FindAllAdornedVariantsL(RFs& aFs, const TDesC& aSearchNameWild, const TDesC& aSearchPath, RPointerArray& aAdornedFileNamesFound) { + CleanupResetAndDestroyPushL(aAdornedFileNamesFound); TFindFile finder(aFs); CDir* dirList=0; TBool matchFound = (finder.FindWildByDir( aSearchNameWild, aSearchPath, *&dirList) == KErrNone); @@ -104,6 +106,7 @@ CleanupStack::PushL(dirList); } CleanupStack::PopAndDestroy(dirList); + CleanupStack::Pop(&aAdornedFileNamesFound); } void Swi::GenerateSearchNameWildL(const TDesC& aFileName, TDes& aSearchNameWild)