Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed CursorWindow signed math for x86 builds."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-20 22:16:12 +00:00
committed by Android (Google) Code Review
parent c60c76caf0 b2bbdaa42f
commit 9953820593
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/androidfw/CursorWindow.cpp
View File

@@ -291,11 +291,11 @@ status_t CursorWindow::allocRow() {
return INVALID_OPERATION;
}
size_t size = mNumColumns * kSlotSizeBytes;
off_t newOffset = mSlotsOffset - size;
if (newOffset < mAllocOffset) {
int32_t newOffset = mSlotsOffset - size;
if (newOffset < (int32_t) mAllocOffset) {
maybeInflate();
newOffset = mSlotsOffset - size;
if (newOffset < mAllocOffset) {
if (newOffset < (int32_t) mAllocOffset) {
return NO_MEMORY;
}
}
@@ -311,7 +311,7 @@ status_t CursorWindow::freeLastRow() {
return INVALID_OPERATION;
}
size_t size = mNumColumns * kSlotSizeBytes;
off_t newOffset = mSlotsOffset + size;
size_t newOffset = mSlotsOffset + size;
if (newOffset > mSize) {
return NO_MEMORY;
}
@@ -326,7 +326,7 @@ status_t CursorWindow::alloc(size_t size, uint32_t* outOffset) {
return INVALID_OPERATION;
}
size_t alignedSize = (size + 3) & ~3;
off_t newOffset = mAllocOffset + alignedSize;
size_t newOffset = mAllocOffset + alignedSize;
if (newOffset > mSlotsOffset) {
maybeInflate();
newOffset = mAllocOffset + alignedSize;
@@ -345,7 +345,7 @@ CursorWindow::FieldSlot* CursorWindow::getFieldSlot(uint32_t row, uint32_t colum
// see CursorWindow_bench.cpp for more details
void *result = static_cast<uint8_t*>(mSlotsStart)
- (((row * mNumColumns) + column) << kSlotShift);
if (result < mSlotsEnd || column >= mNumColumns) {
if (result < mSlotsEnd || result > mSlotsStart || column >= mNumColumns) {
LOG(ERROR) << "Failed to read row " << row << ", column " << column
<< " from a window with " << mNumRows << " rows, " << mNumColumns << " columns";
return nullptr;

8
libs/androidfw/tests/CursorWindow_test.cpp
View File

@@ -166,6 +166,14 @@ TEST(CursorWindowTest, StoreBounds) {
ASSERT_EQ(w->getFieldSlot(0, 3), nullptr);
ASSERT_EQ(w->getFieldSlot(3, 0), nullptr);
ASSERT_EQ(w->getFieldSlot(3, 3), nullptr);
// Can't work with invalid indexes
ASSERT_NE(w->putLong(-1, 0, 0xcafe), OK);
ASSERT_NE(w->putLong(0, -1, 0xcafe), OK);
ASSERT_NE(w->putLong(-1, -1, 0xcafe), OK);
ASSERT_EQ(w->getFieldSlot(-1, 0), nullptr);
ASSERT_EQ(w->getFieldSlot(0, -1), nullptr);
ASSERT_EQ(w->getFieldSlot(-1, -1), nullptr);
}
TEST(CursorWindowTest, Inflate) {