ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix corruption in Vector<> when malloc falied"

Browse Source
This commit is contained in:
Jesse Hall 2013-10-31 04:02:24 +00:00 committed by Gerrit Code Review
commit 51b27e8233
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/utils/VectorImpl.cpp
View File

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