Merge pull request #13249 from shenweip/mem_alloc

Correct the alignment size when allocating memory at a position
This commit is contained in:
Unknown W. Brackets authored and GitHub committed 2020-08-05 10:02:40 -04:00
commit c2255fd10a
1 file changed
+2 -2
+2 -2
View File
@@ -163,13 +163,13 @@ u32 BlockAllocator::AllocAt(u32 position, u32 size, const char *tag)
alignedPosition &= ~(grain_ - 1);
// Since the position was decreased, size must increase.
alignedSize += alignedPosition - position;
alignedSize += position - alignedPosition;
}
// Upalign size to grain.
alignedSize = (alignedSize + grain_ - 1) & ~(grain_ - 1);
// Tell the caller the allocated size from their requested starting position.
size = alignedSize - (alignedPosition - position);
size = alignedSize - (position - alignedPosition);
Block *bp = GetBlockFromAddress(alignedPosition);
if (bp != NULL)