diff -r 2c28af138640 -r c6215323ad55 accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp --- a/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp Wed Jun 23 19:38:32 2010 +0300 +++ b/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp Tue Jul 06 15:43:30 2010 +0300 @@ -103,10 +103,11 @@ } CleanupStack::PopAndDestroy(currentHeap); - iLock = new (ELeave) RNestableLock(); - CleanupStack::PushL(iLock); - LEAVEIFERRORL(iLock->CreateLocal()); - CleanupStack::Pop(iLock); + RNestableLock* lock = new (ELeave) RNestableLock; + CleanupStack::PushL(lock); + LEAVEIFERRORL(lock->CreateLocal()); + CleanupStack::Pop(lock); + iLock = lock; } CRemConInterfaceSelector::CRemConInterfaceSelector() @@ -441,15 +442,15 @@ void CRemConInterfaceSelector::BulkSessionConnectL() { LOG_FUNC - iBulkSession = new(ELeave)RRemConBulk(); - CleanupStack::PushL(iBulkSession); - LEAVEIFERRORL(iBulkSession->Connect()); - CleanupStack::Pop(iBulkSession); - CleanupCloseDeleteAndNullPushL(reinterpret_cast(&iBulkSession)); + RRemConBulk* bulkSession = new(ELeave)RRemConBulk; + CleanupStack::PushL(bulkSession); + LEAVEIFERRORL(bulkSession->Connect()); + CleanupClosePushL(*bulkSession); RCIS_VERBOSE_ASSERT(iBulkReceiver, ERemConIfSelInternalError); - iBulkReceiver->InitialiseL(*iBulkSession, iBulkMaxDataLength); - CleanupStack::Pop(&iBulkSession); + iBulkReceiver->InitialiseL(*bulkSession, iBulkMaxDataLength); + CleanupStack::Pop(2, bulkSession); + iBulkSession = bulkSession; } /**