From a339feb3237fef512d11e214572e48622e79f3e0 Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Wed, 29 Nov 2017 11:58:37 +0900 Subject: [PATCH] [4.0] Fixed abort issue by NULL in Region/Language changed callback Change-Id: Ia5204b649cd9495b19206e0d3bb2d84749f301c5 --- adaptors/tizen/framework-tizen.cpp | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp index 6cfe739..d9c7724 100644 --- a/adaptors/tizen/framework-tizen.cpp +++ b/adaptors/tizen/framework-tizen.cpp @@ -411,8 +411,16 @@ struct Framework::Impl { Framework* framework = static_cast(data); Observer *observer = &framework->mObserver; - framework->SetLanguage( std::string( static_cast(event->value) ) ); - observer->OnLanguageChanged(); + + if( event && event->value ) + { + framework->SetLanguage( std::string( static_cast(event->value) ) ); + observer->OnLanguageChanged(); + } + else + { + DALI_LOG_ERROR( "NULL pointer in Language changed event\n" ); + } } static void AppDeviceRotated(AppCore::AppEventInfoPtr event_info, void *data) @@ -423,8 +431,16 @@ struct Framework::Impl { Framework* framework = static_cast(data); Observer *observer = &framework->mObserver; - framework->SetRegion( std::string( static_cast(event->value) ) ); - observer->OnRegionChanged(); + + if( event && event->value ) + { + framework->SetRegion( std::string( static_cast(event->value) ) ); + observer->OnRegionChanged(); + } + else + { + DALI_LOG_ERROR( "NULL pointer in Region changed event\n" ); + } } static void AppBatteryLow(AppCore::AppEventInfoPtr event, void *data) -- 2.7.4