reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jscript: Fixed handling block_cnt in jsheap_alloc.

Browse Source
This commit is contained in:
Jacek Caban 2009-02-25 01:28:49 +01:00 committed by Alexandre Julliard
parent a2ca48127b
commit 18ee50e5d2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/jscript/jsutils.c
View File

@ -83,26 +83,26 @@ void *jsheap_alloc(jsheap_t *heap, DWORD size)
heap->block_cnt = 1; heap->block_cnt = 1;
} }
if(heap->offset + size < block_size(heap->last_block)) { if(heap->offset + size <= block_size(heap->last_block)) {
tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset; tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset;
heap->offset += size; heap->offset += size;
return tmp; return tmp;
} }
if(size < block_size(heap->last_block+1)) { if(size <= block_size(heap->last_block+1)) {
if(heap->last_block+1 == heap->block_cnt) { if(heap->last_block+1 == heap->block_cnt) {
tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*)); tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*));
if(!tmp) if(!tmp)
return NULL; return NULL;
heap->blocks = tmp; heap->blocks = tmp;
heap->blocks[heap->block_cnt] = heap_alloc(block_size(heap->block_cnt));
if(!heap->blocks[heap->block_cnt])
return NULL;
heap->block_cnt++;
} }
tmp = heap_alloc(block_size(heap->block_cnt+1));
if(!tmp)
return NULL;
heap->blocks[heap->block_cnt++] = tmp;
heap->last_block++; heap->last_block++;
heap->offset = size; heap->offset = size;
return heap->blocks[heap->last_block]; return heap->blocks[heap->last_block];