# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268649763 -7200 # Node ID 1b9ee3c7442d47e38dc212fe97fde87d05bab8c0 # Parent 7237db0d9fca5fa306ba72830b888354fa263d5a Revision: 201009 Kit: 201010 diff -r 7237db0d9fca -r 1b9ee3c7442d cbs/cbsui/UiSrc/ccbsuisettingsviewcontainer.cpp --- a/cbs/cbsui/UiSrc/ccbsuisettingsviewcontainer.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/cbs/cbsui/UiSrc/ccbsuisettingsviewcontainer.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 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" @@ -632,14 +632,14 @@ // Gets the control's help context. // --------------------------------------------------------- // -void CCbsUiSettingsViewContainer::GetHelpContext( TCoeHelpContext& aContext ) const +void CCbsUiSettingsViewContainer::GetHelpContext( + TCoeHelpContext& aContext ) const { - aContext.iMajor = TUid::Uid(KUidCbsUiappDef); + aContext.iMajor = TUid::Uid(0x100058C5); // Messaging MCE UID aContext.iContext = KMCE_HLP_SETTINGS_CB; } - // ---------------------------------------------------- // CCbsUiSettingsViewContainer::HandleResourceChange // diff -r 7237db0d9fca -r 1b9ee3c7442d cellular/SSSettings/inc/CSSSettingsRefreshContainer.h --- a/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h Fri Mar 12 15:45:50 2010 +0200 +++ b/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h Mon Mar 15 12:42:43 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES -#include +#include // FORWARD DECLARATIONS diff -r 7237db0d9fca -r 1b9ee3c7442d engines/vmbxengine/src/vmnumber.cpp --- a/engines/vmbxengine/src/vmnumber.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/engines/vmbxengine/src/vmnumber.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -1374,8 +1374,14 @@ iVMSimQueryDialog = CVMSimQueryDilaog::NewL(); iVMSimQueryDialog->SetVMSimPromptL( *label ); CleanupStack::PopAndDestroy( label ); + //coverity static analysis tool generates a warning finding here + //ignore that + //coverity[deref_ptr_in_call] retVal= iVMSimQueryDialog->ExecuteLD( R_VMBX_TAKE_SIM_NUMBER_INTO_USE ); + //coverity static analysis tool generates a warning finding here + //ignore that + //coverity[check_after_deref] if ( iVMSimQueryDialog == NULL ) { VMBLOGSTRING( "VMBX: RVmbxNumber::QuerySimNumberL: \ diff -r 7237db0d9fca -r 1b9ee3c7442d nwnotifier/group/nwnotifier.mmp --- a/nwnotifier/group/nwnotifier.mmp Fri Mar 12 15:45:50 2010 +0200 +++ b/nwnotifier/group/nwnotifier.mmp Mon Mar 15 12:42:43 2010 +0200 @@ -30,7 +30,7 @@ START RESOURCE nwnotifier.rss HEADER TARGET nwnotifier_0x20026826 -TARGETPATH RESOURCE_FILES_DIR +TARGETPATH APP_RESOURCE_DIR LANGUAGE_IDS END //RESOURCE diff -r 7237db0d9fca -r 1b9ee3c7442d nwnotifier/src/networknotifiernotewrapper.cpp --- a/nwnotifier/src/networknotifiernotewrapper.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/nwnotifier/src/networknotifiernotewrapper.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -17,7 +17,7 @@ // System includes #include -#include +#include #include #include diff -r 7237db0d9fca -r 1b9ee3c7442d nwnotifier/src/nwregistrationstatusmonitor.cpp --- a/nwnotifier/src/nwregistrationstatusmonitor.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/nwnotifier/src/nwregistrationstatusmonitor.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -20,7 +20,7 @@ #include "nwregistrationstatusmonitor.h" // System #include -#include // KMmTsyModuleName +#include // KMmTsyModuleName // ================= MEMBER FUNCTIONS ======================================= diff -r 7237db0d9fca -r 1b9ee3c7442d phoneclientserver/CallUI/Inc/CaUiPlugin/CaUiPlugin.h --- a/phoneclientserver/CallUI/Inc/CaUiPlugin/CaUiPlugin.h Fri Mar 12 15:45:50 2010 +0200 +++ b/phoneclientserver/CallUI/Inc/CaUiPlugin/CaUiPlugin.h Mon Mar 15 12:42:43 2010 +0200 @@ -24,7 +24,7 @@ #include #include // AIW dialdata. #include //TServiceId -#include "CaUiDialResultObserver.h" +#include "cauidialresultobserver.h" #include "CaUI.hrh" // FORWARD DECLARATIONS diff -r 7237db0d9fca -r 1b9ee3c7442d phoneclientserver/CallUI/Src/CaUiEngine/CaUiActiveObject.cpp --- a/phoneclientserver/CallUI/Src/CaUiEngine/CaUiActiveObject.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/phoneclientserver/CallUI/Src/CaUiEngine/CaUiActiveObject.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -26,8 +26,8 @@ #include #include #include -#include -#include "cauimessagesender.h" +#include +#include "CaUiMessageSender.h" #include "cauilogger.h" // CONSTANTS diff -r 7237db0d9fca -r 1b9ee3c7442d phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp --- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -60,19 +60,22 @@ // Destructor. // ----------------------------------------------------------------------------- // + CPhSrvSession::~CPhSrvSession() { if ( iServer ) { iServer->CancelCreateAll( *this ); - - if ( iContainer ) - { - iServer->RemoveContainer( iContainer ); - iContainer = NULL; - } } + delete iObjectIx; + + if ( iContainer ) + { + //coverity[var_deref_model] + iServer->RemoveContainer( iContainer ); + iContainer = NULL; + } } diff -r 7237db0d9fca -r 1b9ee3c7442d satengine/SatServer/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp --- a/satengine/SatServer/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satengine/SatServer/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -1527,7 +1527,7 @@ TInt ipvType( KSatInvalidPdpType ); TInt length( aAddress.Length() ); - if ( &aAddress && length ) + if ( length ) { // The maximum length of a IP address is less than 39. if ( KSatMaxIPv4AddressLength >= length && diff -r 7237db0d9fca -r 1b9ee3c7442d satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp --- a/satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satengine/SatServer/Commands/SetUpCallCmd/src/CSetUpCallHandler.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -744,9 +744,15 @@ dialData->SetCallType( CAiwDialData::EAIWVoice ); dialData->SetWindowGroup( AIWDialData::KAiwGoToIdle ); + // coverity static analysis tool generates a false finding here + // eliminating that + // coverity[use_after_free] dialData->SetPhoneNumberL( telNumber ); dialData->SetSATCall( ETrue ); dialData->SetShowNumber( EFalse ); + // coverity static analysis tool generates a false finding here + // eliminating that + // coverity[use_after_free] dialData->SetNameL( name ); dialData->SetAllowMatch( EFalse ); // Remove the redial mechanism from S60 5.x. @@ -766,6 +772,9 @@ { LOG( NORMAL, "SETUPCALL: CSetUpCallHandler::DoSetupCallL SetBearerL" ) + // coverity static analysis tool generates a false finding here + // eliminating that + // coverity[use_after_free] dialData->SetBearerL( iSetUpCallData.iCapabilityConfigParams ); } @@ -774,10 +783,16 @@ { LOG( NORMAL, "SETUPCALL: CSetUpCallHandler::DoSetupCallL SetSubAddressL" ) + // coverity static analysis tool generates a false finding here + // eliminating that + // coverity[use_after_free] dialData->SetSubAddressL( iSetUpCallData.iSubAddress ); } CAiwGenericParamList& paramList = iServiceHandler->InParamListL(); + // coverity static analysis tool generates a false finding here + // eliminating that + // coverity[use_after_free] dialData->FillInParamListL( paramList ); iServiceHandler->ExecuteServiceCmdL( diff -r 7237db0d9fca -r 1b9ee3c7442d satengine/SatServer/Engine/src/CSatCommandContainer.cpp --- a/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -318,7 +318,10 @@ // to handle client responses. If SAT UI / Proactive command is executing // while Bluetooth SAP is enabled, SAT UI sends ClientResponse and that must // be preveted - iServiceReqs->Reset(); + if ( iServiceReqs ) + { + iServiceReqs->Reset(); + } // Close all reserved BIP Data channels if ( iBipUtils ) @@ -338,7 +341,10 @@ #ifdef SAT_USE_DUMMY_TSY // Close ATSY. This is needed when testin BT SAP in emulator - iUSatAPI->Close(); + if ( iUSatAPI ) + { + iUSatAPI->Close(); + } #endif LOG( NORMAL, diff -r 7237db0d9fca -r 1b9ee3c7442d satengine/SatServer/Engine/src/CSatSIconSubSession.cpp --- a/satengine/SatServer/Engine/src/CSatSIconSubSession.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satengine/SatServer/Engine/src/CSatSIconSubSession.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -312,17 +312,11 @@ CleanupStack::PopAndDestroy( converter ); - if ( iClut ) - { delete iClut; iClut = NULL; - } - - if ( iIconData ) - { + delete iIconData; iIconData = NULL; - } iMessage.Complete( KErrNone ); LOG( SIMPLE, "SATENGINE: CSatSIconSubSession::NotifyGetClutL exiting" ) diff -r 7237db0d9fca -r 1b9ee3c7442d satui/satapp/SATUISrc/CSatUiViewAppUi.cpp --- a/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satui/satapp/SATUISrc/CSatUiViewAppUi.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -525,7 +525,15 @@ CEikCaptionedControl* capControl = iDisplayTextIconDialog->GetControlByControlType ( EEikCtRichTextEditor ); - CCoeControl* coeControl = capControl->iControl; + CCoeControl* coeControl = NULL; + if ( capControl ) + { + coeControl = capControl->iControl; + } + if ( !coeControl ) + { + User::Leave( KErrUnknown ); + } CEikRichTextEditor* rtxtEditor = reinterpret_cast( coeControl ); diff -r 7237db0d9fca -r 1b9ee3c7442d satui/satplugin/aisatpluginsrc/caisatengine.cpp --- a/satui/satplugin/aisatpluginsrc/caisatengine.cpp Fri Mar 12 15:45:50 2010 +0200 +++ b/satui/satplugin/aisatpluginsrc/caisatengine.cpp Mon Mar 15 12:42:43 2010 +0200 @@ -314,30 +314,37 @@ { TFLOGSTRING( "CAiSatPlugin::DuplicateBitmap() called" ) + TInt error( KErrGeneral ); + + // Get display mode about bitmap + TDisplayMode bmpDisplayMode = aSrcBmp->DisplayMode(); + // Get size and scan line length of the source bitmap. TSize size = aSrcBmp->SizeInPixels(); TInt scanLineLength = CFbsBitmap::ScanLineLength( - size.iWidth, aSrcBmp->DisplayMode() ); - TInt error( KErrNone ); - // Copy the data area of the source bimap to the dest bitmap. - if ( aSrcBmp && aSrcBmp->DataAddress() ) + size.iWidth, bmpDisplayMode ); + TInt bitmapHeight = size.iHeight; + + TUint* bufUint = new TUint[ scanLineLength ]; + if ( bufUint ) { - TAny* bitmapData( NULL ); - - bitmapData = memcpy( - (TAny*)aDestBmp->DataAddress(), - (TAny*)aSrcBmp->DataAddress(), - scanLineLength * size.iHeight ); - - if ( NULL == bitmapData ) + TPtr8 bufPtr ( ( TUint8* )bufUint, scanLineLength, scanLineLength ); + // Initialize the pixel data for destination bitmap + for ( TInt pixelIndex = 0; pixelIndex < bitmapHeight; ++pixelIndex ) { - TFLOGSTRING( "CAiSatPlugin::DuplicateBitmap() \ - Failed to copy memory data of bitmap." ) - error = KErrBadHandle; + TPoint pixelPoint( 0, pixelIndex ); + aSrcBmp->GetScanLine( bufPtr, pixelPoint, + scanLineLength, bmpDisplayMode ); + aDestBmp->SetScanLine( bufPtr, pixelIndex ); } + error = KErrNone; + TFLOGSTRING3( "CAiSatPlugin::DuplicateBitmap() \ + scanLineLength = %d bitmapHeight = %d", scanLineLength, bitmapHeight ) } + delete bufUint; + bufUint = NULL; + TFLOGSTRING( "CAiSatPlugin::DuplicateBitmap() exits" ) - return error; }