From 2379dac2638ab20c3cbbbf643faa0af33c79d466 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 22 Nov 2021 16:39:10 +0900 Subject: [PATCH] [Tizen] Prevent accessing invalid index This reverts commit 4365bb3d85446b7b08f1a0516a137f55c03f9d63. Change-Id: Id9eb1a0559ca8a4c69442bbb8c25b1c2fb5b6598 --- dali/public-api/common/dali-vector.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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(VectorBase::mData); address += index; return *address; -- 2.7.4