jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

critical realloc bugfix; refs #4818

Browse source
This commit is contained in:
Andreas Rumpf 2017-02-03 09:48:52 +01:00
commit 04c4d3d77f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/system/alloc.nim
View file

@ -295,10 +295,11 @@ proc writeFreeList(a: MemRegion) =
proc requestOsChunks(a: var MemRegion, size: int): PBigChunk = proc requestOsChunks(a: var MemRegion, size: int): PBigChunk =
when not defined(emscripten): when not defined(emscripten):
if not a.blockChunkSizeIncrease: if not a.blockChunkSizeIncrease:
if a.currMem < 64 * 1024: let usedMem = a.currMem # - a.freeMem
if usedMem < 64 * 1024:
a.nextChunkSize = PageSize*4 a.nextChunkSize = PageSize*4
else: else:
a.nextChunkSize = min(roundup(a.currMem shr 2, PageSize), a.nextChunkSize * 2) a.nextChunkSize = min(roundup(usedMem shr 2, PageSize), a.nextChunkSize * 2)
var size = size var size = size
if size > a.nextChunkSize: if size > a.nextChunkSize:
@ -708,7 +709,7 @@ proc realloc(allocator: var MemRegion, p: pointer, newsize: Natural): pointer =
if newsize > 0: if newsize > 0:
result = alloc0(allocator, newsize) result = alloc0(allocator, newsize)
if p != nil: if p != nil:
copyMem(result, p, ptrSize(p)) copyMem(result, p, min(ptrSize(p), newsize))
dealloc(allocator, p) dealloc(allocator, p)
elif p != nil: elif p != nil:
dealloc(allocator, p) dealloc(allocator, p)