Rémi Bernon : ntdll: Clear BLOCK_FLAG_PREV_FREE flag out of shrink_used_block.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a540b4b2461431392da5dee7ac4995640be9e455
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a540b4b2461431392da5dee7ac49956...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Nov 25 17:52:54 2022 +0100

ntdll: Clear BLOCK_FLAG_PREV_FREE flag out of shrink_used_block.

---

 dlls/ntdll/heap.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index c4371ec78fd..02e4be09cdd 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -824,10 +824,8 @@ static inline void shrink_used_block( struct heap *heap, ULONG flags, struct blo
     }
     else
     {
-        struct block *next;
         block_set_size( block, old_block_size );
         block->tail_size = old_block_size - sizeof(*block) - size;
-        if ((next = next_block( subheap, block ))) block_set_flags( next, BLOCK_FLAG_PREV_FREE, 0 );
     }
 }
 
@@ -1501,14 +1499,16 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T
 
 static NTSTATUS heap_allocate_block( struct heap *heap, ULONG flags, SIZE_T block_size, SIZE_T size, void **ret )
 {
+    struct block *block, *next;
     SIZE_T old_block_size;
-    struct block *block;
+    SUBHEAP *subheap;
 
     /* Locate a suitable free block */
 
     if (!(block = find_free_block( heap, flags, block_size ))) return STATUS_NO_MEMORY;
     /* read the free block size, changing block type or flags may alter it */
     old_block_size = block_get_size( block );
+    subheap = block_get_subheap( heap, block );
 
     block_set_type( block, BLOCK_TYPE_USED );
     block_set_flags( block, ~0, BLOCK_USER_FLAGS( flags ) );
@@ -1516,6 +1516,8 @@ static NTSTATUS heap_allocate_block( struct heap *heap, ULONG flags, SIZE_T bloc
     initialize_block( block, 0, size, flags );
     mark_block_tail( block, flags );
 
+    if ((next = next_block( subheap, block ))) block_set_flags( next, BLOCK_FLAG_PREV_FREE, 0 );
+
     *ret = block + 1;
     return STATUS_SUCCESS;
 }
@@ -1643,10 +1645,11 @@ static NTSTATUS heap_resize_block( struct heap *heap, ULONG flags, struct block
     valgrind_notify_resize( block + 1, *old_size, size );
     block_set_flags( block, BLOCK_FLAG_USER_MASK & ~BLOCK_FLAG_USER_INFO, BLOCK_USER_FLAGS( flags ) );
     shrink_used_block( heap, flags, block, old_block_size, block_size, size );
-
     initialize_block( block, *old_size, size, flags );
     mark_block_tail( block, flags );
 
+    if ((next = next_block( subheap, block ))) block_set_flags( next, BLOCK_FLAG_PREV_FREE, 0 );
+
     heap_unlock( heap, flags );
 
     *ret = block + 1;