From d5dafcb8a4540dfc8c84e3aabb2d992cf9043492 Mon Sep 17 00:00:00 2001
From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Fri, 27 May 2016 10:14:28 +0900
Subject: [PATCH] [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>
---
 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 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 );
 }
-- 
2.7.4