diff options
| author | Elliott Hughes <enh@google.com> | 2022-04-28 15:52:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-28 15:52:30 +0000 |
| commit | c94d40e4a8373ba1d8132344e036ae43e699d935 (patch) | |
| tree | 438a937505f47b9e559f8d05b460e7c94de046e7 | |
| parent | 1f85546be5f58c2edcf19fa5b7efb36a6568251e (diff) | |
| parent | b10bf63c9305a84347837726e25f8f1216b18406 (diff) | |
| download | core-c94d40e4a8373ba1d8132344e036ae43e699d935.tar.gz | |
Merge "libutils: clearer abort on overflow." into tm-dev
| -rw-r--r-- | libutils/VectorImpl.cpp | 14 | ||||
| -rw-r--r-- | libutils/Vector_test.cpp | 9 |
2 files changed, 15 insertions, 8 deletions
diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp index c97a19bc6..d951b8bbb 100644 --- a/libutils/VectorImpl.cpp +++ b/libutils/VectorImpl.cpp @@ -279,14 +279,12 @@ ssize_t VectorImpl::replaceAt(const void* prototype, size_t index) ssize_t VectorImpl::removeItemsAt(size_t index, size_t count) { - ALOG_ASSERT((index+count)<=size(), - "[%p] remove: index=%d, count=%d, size=%d", - this, (int)index, (int)count, (int)size()); - - if ((index+count) > size()) - return BAD_VALUE; - _shrink(index, count); - return index; + size_t end; + LOG_ALWAYS_FATAL_IF(__builtin_add_overflow(index, count, &end), "overflow: index=%zu count=%zu", + index, count); + if (end > size()) return BAD_VALUE; + _shrink(index, count); + return index; } void VectorImpl::finish_vector() diff --git a/libutils/Vector_test.cpp b/libutils/Vector_test.cpp index 5336c40c3..6d90eaa9e 100644 --- a/libutils/Vector_test.cpp +++ b/libutils/Vector_test.cpp @@ -136,4 +136,13 @@ TEST_F(VectorTest, editArray_Shared) { } } +TEST_F(VectorTest, removeItemsAt_overflow) { + android::Vector<int> v; + for (int i = 0; i < 666; i++) v.add(i); + + ASSERT_DEATH(v.removeItemsAt(SIZE_MAX, 666), "overflow"); + ASSERT_DEATH(v.removeItemsAt(666, SIZE_MAX), "overflow"); + ASSERT_DEATH(v.removeItemsAt(SIZE_MAX, SIZE_MAX), "overflow"); +} + } // namespace android |