From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 12 May 2017 18:22:28 +0000 (+0000)
Subject: Merge "Check for NULL return value in button-impl.cpp" into devel/master
X-Git-Tag: dali_1.2.40~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0e07671d24b10bd49423ec6ce22817000bb18336;hp=565f93cb19bc3e1058fc057bea74c973489deab3

Merge "Check for NULL return value in button-impl.cpp" into devel/master
---

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index ac12863..d580457 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -363,7 +363,10 @@ std::string Button::GetLabelText() const
   if ( labelProperty )
   {
     Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    if( value )
+    {
+      value->Get( textLabel );
+    }
   }
 
   return textLabel;