Merge "Fixed CursorWindow signed math for x86 builds." (99538205) · Commits · e / os / android_frameworks_base

libs/androidfw/CursorWindow.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;

libs/androidfw/tests/CursorWindow_test.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -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) {