From 2eea2efda506ac048e2fe8ddf684088e413d187c Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 22 Dec 2015 19:54:47 +0900 Subject: [PATCH] [3.0] Fix svace issues Change-Id: I8401398b8560e8af82d27a32e9e96b9c55bfe38a --- dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp | 2 ++ dali-toolkit/internal/text/text-controller.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp index 8e509a9..c37c94b 100644 --- a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp @@ -329,6 +329,8 @@ void NPatchRenderer::InitializeRenderer( Renderer& renderer ) } else { + DALI_ASSERT_ALWAYS( geometry && "Geometry handle is empty" ); + mImpl->mRenderer.SetGeometry( geometry ); Material material = mImpl->mRenderer.GetMaterial(); if( material ) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index e990d42..39562a1 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1349,6 +1349,12 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ bool maxLengthReached( false ); DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" ) + + if( mImpl->mEventData == NULL ) + { + return; + } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); -- 2.7.4