system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Move large block resize in heap_reallocate.

Browse source
This commit is contained in:
Rémi Bernon 2022-11-25 00:14:57 +01:00 committed by Alexandre Julliard
parent 0c5f9e8d4e
commit 4334c5b0c1
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dlls/ntdll/heap.c
View file

@ -878,19 +878,6 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct
SIZE_T old_size = arena->data_size;
char *data = (char *)(block + 1);
if (arena->block_size - sizeof(*block) >= size)
{
/* FIXME: we could remap zero-pages instead */
valgrind_notify_resize( data, old_size, size );
initialize_block( block, old_size, size, flags );
arena->data_size = size;
valgrind_make_noaccess( (char *)block + sizeof(*block) + arena->data_size,
arena->block_size - sizeof(*block) - arena->data_size );
return block;
}
if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL;
if (!(block = allocate_large_block( heap, flags, size )))
{
@ -1647,7 +1634,24 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b
if (block_get_flags( block ) & BLOCK_FLAG_LARGE)
{
if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY;
ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block );
old_block_size = large->block_size;
old_size = large->data_size;
if (old_block_size - sizeof(*block) < size)
{
if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY;
*ret = block + 1;
return STATUS_SUCCESS;
}
/* FIXME: we could remap zero-pages instead */
valgrind_notify_resize( block + 1, old_size, size );
initialize_block( block, old_size, size, flags );
large->data_size = size;
valgrind_make_noaccess( (char *)block + sizeof(*block) + large->data_size,
old_block_size - sizeof(*block) - large->data_size );
*ret = block + 1;
return STATUS_SUCCESS;