From 8fd54282798caeddc29e1e6c0e05d1195e52e9e0 Mon Sep 17 00:00:00 2001
From: suhyung Eom <suhyung.eom@samsung.com>
Date: Tue, 31 May 2016 18:13:46 +0900
Subject: [PATCH] [3.0] Prevention for being assigned NULL value

This reverts commit 36616205b64513302a43ced97db284cbe670ca2d.
Change-Id: I0b66d0d768448b17b8140f6a27d2038513c4dbe3
---
 plugins/dali-script-v8/src/object/property-value-wrapper.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 b160642..7402bd4 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 );
 }
-- 
2.7.4