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

Merge "libutils: clearer abort on overflow." into tm-dev

Browse source
This commit is contained in:
Elliott Hughes 2022-04-28 15:52:30 +00:00 • committed by Android (Google) Code Review
commit c94d40e4a8
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)
{
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()

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