Merge "fix corruption in Vector<> when malloc falied" (51b27e82) · Commits · e / os / android_frameworks_native

libs/utils/VectorImpl.cpp

+14 −2

Original line number	Diff line number	Diff line
		@@ -384,7 +384,11 @@ void* VectorImpl::_grow(size_t where, size_t amount)
		{
		const SharedBuffer* cur_sb = SharedBuffer::bufferFromData(mStorage);
		SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);
		if (sb) {
		mStorage = sb->data();
		} else {
		return NULL;
		}
		} else {
		SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize);
		if (sb) {
		@@ -399,6 +403,8 @@ void* VectorImpl::_grow(size_t where, size_t amount)
		}
		release_storage();
		mStorage = const_cast<void*>(array);
		} else {
		return NULL;
		}
		}
		} else {
		@@ -436,7 +442,11 @@ void VectorImpl::_shrink(size_t where, size_t amount)
		{
		const SharedBuffer* cur_sb = SharedBuffer::bufferFromData(mStorage);
		SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);
		if (sb) {
		mStorage = sb->data();
		} else {
		return;
		}
		} else {
		SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize);
		if (sb) {
		@@ -451,6 +461,8 @@ void VectorImpl::_shrink(size_t where, size_t amount)
		}
		release_storage();
		mStorage = const_cast<void*>(array);
		} else{
		return;
		}
		}
		} else {