wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 09:18:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
The original patch handled the grow case but not the shrink case. When the
current and new allocation sizes are in different size classes, jemalloc's
realloc will move the allocation when shrinking, not just truncate the existing
one.

Based on work by Jon Coppeard.
This commit is contained in:
Moonchild 2020-11-19 17:48:59 +00:00 • committed by roytam1
commit 035de9597b
1 changed files with 21 additions and 5 deletions
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;
}