From: Heeyong Song Date: Thu, 9 Feb 2017 08:22:56 +0000 (+0900) Subject: [3.0] Fix SVACE issue X-Git-Tag: accepted/tizen/3.0/common/20170210.172532~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=27d3034d1d875dc6f3a54dcc5a62ca684112e260 [3.0] Fix SVACE issue 1. memory leak - Delete the elements of mResourceRequests 2. Uninitialized class members Change-Id: I72ffa76a6ced393fb92d1bc32a18007f12f71710 --- diff --git a/adaptors/base/combined-update-render/combined-update-render-controller.cpp b/adaptors/base/combined-update-render/combined-update-render-controller.cpp index 738da28..d9a5b63 100644 --- a/adaptors/base/combined-update-render/combined-update-render-controller.cpp +++ b/adaptors/base/combined-update-render/combined-update-render-controller.cpp @@ -105,6 +105,7 @@ CombinedUpdateRenderController::CombinedUpdateRenderController( AdaptorInternalS mDestroyUpdateRenderThread( FALSE ), mUpdateRenderThreadCanSleep( FALSE ), mPendingRequestUpdate( FALSE ), + mUseElapsedTimeAfterWait( FALSE ), mNewSurface( NULL ), mPostRendering( FALSE ) { diff --git a/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp b/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp index eb262c5..64d9389 100644 --- a/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp @@ -42,6 +42,8 @@ DisplayConnection* DisplayConnection::New() } DisplayConnection::DisplayConnection() +: mDisplay( NULL ), + mSurfaceType( RenderSurface::ECORE_RENDER_SURFACE ) { } diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp index 7f425ed..9c64e28 100644 --- a/adaptors/tizen/framework-tizen.cpp +++ b/adaptors/tizen/framework-tizen.cpp @@ -64,7 +64,8 @@ struct Framework::Impl // Constructor Impl(void* data, Type type ) : mAbortCallBack( NULL ), - mCallbackManager( NULL ) + mCallbackManager( NULL ), + mEventCallback() { mFramework = static_cast(data); diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp index db22b86..61f88f0 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp @@ -40,6 +40,7 @@ TestPlatformAbstraction::TestPlatformAbstraction() TestPlatformAbstraction::~TestPlatformAbstraction() { + DiscardRequest(); } void TestPlatformAbstraction::Suspend() @@ -264,6 +265,7 @@ void TestPlatformAbstraction::SetAllResourceRequestsAsLoaded() Integration::ResourcePointer resource(bitmap); bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80); SetResourceLoaded( request->GetId(), request->GetType()->id, resource ); + delete request; } mResourceRequests.Clear(); } @@ -273,13 +275,21 @@ void TestPlatformAbstraction::SetAllResourceRequestsAsFailed( Integration::Resou for( ResourceRequestContainer::Iterator iter = mResourceRequests.Begin(), endIter = mResourceRequests.End(); iter != endIter; ++iter ) { + Integration::ResourceRequest* request = *iter; SetResourceLoadFailed( (*iter)->GetId(), failure); + delete request; } mResourceRequests.Clear(); } void TestPlatformAbstraction::DiscardRequest() { + for( ResourceRequestContainer::Iterator iter = mResourceRequests.Begin(), endIter = mResourceRequests.End(); + iter != endIter; ++iter ) + { + Integration::ResourceRequest* request = *iter; + delete request; + } mResourceRequests.Clear(); }