From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Fri, 27 May 2016 01:14:28 +0000 (+0900)
Subject: [3.0] Prevention for being assigned NULL value
X-Git-Tag: accepted/tizen/ivi/20160527.123058
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Fivi%2F20160527.123058;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[3.0] Prevention for being assigned NULL value

 - Pointer 'v8Value' may have NULL value

Change-Id: I5ff68d3b78cab271b443b58bb470985e906b8c6a
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

diff --git a/plugins/dali-script-v8/src/object/property-value-wrapper.cpp b/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
index 8469d7f..cb69076 100644
--- a/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
+++ b/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
@@ -527,7 +527,13 @@ v8::Local<v8::Object> CreateJavaScriptPrimitive( v8::Isolate* isolate, const Dal
        break;
      }
    }
- v8::Local<v8::Object> ret = v8Value->ToObject();
+
+ v8::Local<v8::Object> ret;
+
+ if( v8Value->IsObject() )
+ {
+   ret = v8Value->ToObject();
+ }
 
  return handleScope.Escape( ret );
 }