From 58ca02131d2fe77d8f05611aafe656e8dc005ca3 Mon Sep 17 00:00:00 2001
From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 8 May 2017 16:50:01 +0900
Subject: [PATCH] Check for NULL return value in button-impl.cpp

Change-Id: I10ee95b46237a483df92cd4f2a7098ead73028f4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---
 dali-toolkit/internal/controls/buttons/button-impl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 79ac7db..08beee1 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;
-- 
2.7.4