Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[xpcom] Don't use realloc for shrinking nsTArrays when allowRealloc is false.

master
Fedor 2020-11-26 05:42:11 +02:00
parent a0f6231e6d
commit 8391e57b27
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xpcom/glue/nsTArray-inl.h
View File

@ -248,12 +248,28 @@ nsTArray_base<Alloc, Copy>::ShrinkCapacity(size_type aElemSize,
return;
}
size_type size = sizeof(Header) + length * aElemSize;
void* ptr = nsTArrayFallibleAllocator::Realloc(mHdr, size);
if (!ptr) {
return;
size_type newSize = sizeof(Header) + length * aElemSize;
Header* newHeader;
if (!Copy::allowRealloc) {
// Malloc() and copy
newHeader = static_cast<Header*>(nsTArrayFallibleAllocator::Malloc(newSize));
if (!newHeader) {
return;
}
Copy::MoveNonOverlappingRegionWithHeader(newHeader, mHdr, Length(), aElemSize);
nsTArrayFallibleAllocator::Free(mHdr);
} else {
// Realloc() existing data
newHeader = static_cast<Header*>(nsTArrayFallibleAllocator::Realloc(mHdr, newSize));
if (!newHeader) {
return;
}
}
mHdr = static_cast<Header*>(ptr);
mHdr = newHeader;
mHdr->mCapacity = length;
}