ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libutils: clearer abort on overflow." am: 4ba0e62970

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2078005

Change-Id: If44c9098395c40dfa7d6b6b4c84ac41aee1c429a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2022-04-28 00:49:48 +00:00 • committed by Automerger Merge Worker
commit 2c623bc650
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libutils/VectorImpl.cpp
View file

@ -279,14 +279,12 @@ ssize_t VectorImpl::replaceAt(const void* prototype, size_t index)
ssize_t VectorImpl::removeItemsAt(size_t index, size_t count) ssize_t VectorImpl::removeItemsAt(size_t index, size_t count)
{ {
ALOG_ASSERT((index+count)<=size(), size_t end;
"[%p] remove: index=%d, count=%d, size=%d", LOG_ALWAYS_FATAL_IF(__builtin_add_overflow(index, count, &end), "overflow: index=%zu count=%zu",
this, (int)index, (int)count, (int)size()); index, count);
if (end > size()) return BAD_VALUE;
if ((index+count) > size()) _shrink(index, count);
return BAD_VALUE; return index;
_shrink(index, count);
return index;
} }
void VectorImpl::finish_vector() void VectorImpl::finish_vector()

9
libutils/Vector_test.cpp
View file

@ -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 } // namespace android