--- a/accessoryservices/accessoryserver/src/Server/AccSrvSettingsHandler.cpp Fri Apr 16 16:18:45 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvSettingsHandler.cpp Mon May 03 13:42:22 2010 +0300
@@ -258,17 +258,18 @@
TPtr8 ptrBuf( buf->Des() );
User::LeaveIfError( session.Connect() );
+ CleanupClosePushL ( session );
User::LeaveIfError( file.Open( session, KHWDevicesFile, EFileRead ) );
file.Read( ptrBuf );
file.Close();
- session.Close();
TLex8 l( ptrBuf );
TInt32 temp;
l.Val( temp );
settings = static_cast< TUint32 >( temp );
- CleanupStack::Pop( buf );
+ CleanupStack::PopAndDestroy ( &session );
+ CleanupStack::PopAndDestroy ( buf );
COM_TRACE_1( "[AccFW:AccServer] CAccSrvSettingsHandler::GetSupportedHWDevicesL() - return %d", settings );