From: Heeyong Song <heeyong.song@samsung.com>
Date: Wed, 20 Oct 2021 01:11:26 +0000 (+0000)
Subject: Merge "Protect dereferencing null in Node" into devel/master
X-Git-Tag: dali_2.0.49~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55ee7a2d5743e24ea9349b31e3a5d60eef9522de;hp=38d5ea14619ce0cfa0b21edbfc3900b97403e4ff;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge "Protect dereferencing null in Node" into devel/master
---

diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
index d1fa90b..4714a36 100644
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -360,7 +360,12 @@ public:
    */
   const Vector3& GetParentOrigin() const
   {
-    return mParentOrigin.Get(0);
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mParentOrigin.mTxManagerData)
+    {
+      return mParentOrigin.Get(0);
+    }
+
+    return Vector3::ZERO;
   }
 
   /**
@@ -378,7 +383,12 @@ public:
    */
   const Vector3& GetAnchorPoint() const
   {
-    return mAnchorPoint.Get(0);
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mAnchorPoint.mTxManagerData)
+    {
+      return mAnchorPoint.Get(0);
+    }
+
+    return Vector3::ZERO;
   }
 
   /**
@@ -397,7 +407,7 @@ public:
    */
   const Vector3& GetPosition(BufferIndex bufferIndex) const
   {
-    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mPosition.mTxManagerData)
     {
       return mPosition.Get(bufferIndex);
     }
@@ -433,7 +443,7 @@ public:
    */
   const Quaternion& GetOrientation(BufferIndex bufferIndex) const
   {
-    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mOrientation.mTxManagerData)
     {
       return mOrientation.Get(0);
     }
@@ -470,7 +480,7 @@ public:
    */
   const Vector3& GetScale(BufferIndex bufferIndex) const
   {
-    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mScale.mTxManagerData)
     {
       return mScale.Get(0);
     }
@@ -620,7 +630,7 @@ public:
    */
   const Vector3& GetSize(BufferIndex bufferIndex) const
   {
-    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
+    if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mSize.mTxManagerData)
     {
       return mSize.Get(0);
     }