--- a/brandingserver/bsserver/cbsstoragemanager.cpp	Thu Jan 07 12:56:16 2010 +0200
+++ b/brandingserver/bsserver/cbsstoragemanager.cpp	Mon Jan 18 20:33:04 2010 +0200
@@ -900,6 +900,9 @@
 		CDir* directories = NULL;
 		
 		User::LeaveIfError( iFs.GetDir( driveAndPath, KEntryAttNormal, ESortByName, files, directories ) );
+
+		CleanupStack :: PushL (files);
+		CleanupStack :: PushL (directories);
 		
 		TInt count = files->Count();
 		for( TInt i = 0; i < count; i++ )
@@ -937,7 +940,10 @@
 				}
 			CleanupStack::PopAndDestroy( fullName );
 			}
-		CleanupStack::PopAndDestroy( nameWithDrive );
+		
+		CleanupStack :: PopAndDestroy (directories);
+		CleanupStack :: PopAndDestroy (files);
+		CleanupStack :: PopAndDestroy (nameWithDrive);
 		}
 	TRACE( T_LIT( "CBSStorageManager::CleanupFileL end") );
 	}