From 9d9d656c92bc768ef31c0bae604102071e6e3029 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 12 Sep 2017 17:03:07 +0900 Subject: [PATCH] Fix SVACE issue - Fix to prevent 'name' from passing a null pointer to a 'std::string', because it would result in dereferencing a null pointer. Change-Id: If01974fa77662db75480962ff52373a6cc403b17 Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/visuals/text/text-visual.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index 7ce455e..889b57d 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.cpp +++ b/dali-toolkit/internal/visuals/text/text-visual.cpp @@ -74,7 +74,11 @@ std::string GetHorizontalAlignment( Toolkit::Text::Layout::HorizontalAlignment a HORIZONTAL_ALIGNMENT_STRING_TABLE, HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); - return std::string( name ); + if( name ) + { + return std::string( name ); + } + return std::string(); } std::string GetVerticalAlignment( Toolkit::Text::Layout::VerticalAlignment alignment ) @@ -83,7 +87,11 @@ std::string GetVerticalAlignment( Toolkit::Text::Layout::VerticalAlignment align VERTICAL_ALIGNMENT_STRING_TABLE, VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ); - return std::string( name ); + if( name ) + { + return std::string( name ); + } + return std::string(); } const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( -- 2.7.4