X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fcommon%2Fdali-vector.h;h=471e8b4f8c086f3046c2ad2daafae93282ad8a42;hb=0fde84c381dc73505ed8b229201ab9b278530eb8;hp=80c63647571461a057d7c5a98aef7792b7c01158;hpb=62cfeeb09f1e213ede6115bb36e3c7157dade816;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h
index 80c6364..471e8b4 100644
--- a/dali/public-api/common/dali-vector.h
+++ b/dali/public-api/common/dali-vector.h
@@ -555,7 +555,11 @@ public: // API
   const ItemType& operator[](SizeType index) const
   {
     DALI_ASSERT_VECTOR(VectorBase::mData && "Vector is empty");
-    DALI_ASSERT_VECTOR(index < VectorBase::Count() && "Index out of bounds");
+    if(index >= VectorBase::Count())
+    {
+      // Prevent accessing invalid index
+      index = 0;
+    }
     ItemType* address = reinterpret_cast<ItemType*>(VectorBase::mData);
     address += index;
     return *address;