[PATCH 6/6] ntdll: Use block size helpers in heap_reallocate.

Rémi Bernon wine at gitlab.winehq.org
Thu May 19 02:28:15 CDT 2022


From: Rémi Bernon <rbernon at codeweavers.com>

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/ntdll/heap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index e3bfc3d37e7..6e64d0d7dfb 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -1662,8 +1662,8 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size
 
     /* Check if we need to grow the block */
 
-    old_data_size = (block->size & ARENA_SIZE_MASK);
-    old_size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes;
+    old_data_size = block_get_size( block ) - sizeof(*block);
+    old_size = block_get_size( block ) - block_get_overhead( block );
     if (data_size > old_data_size)
     {
         if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE) &&
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/93



More information about the wine-devel mailing list