[PATCH 1/4] ntdll: Fix tail padding in mark_block_tail().

[Paul Gofman]

From: Paul Gofman

---
 dlls/kernel32/tests/heap.c | 1 -
 dlls/ntdll/heap.c          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index d2742b55495..8c101e1c47d 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -3127,7 +3127,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags
         ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" );
         ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" );

-        todo_wine_if( global_flags & FLG_HEAP_ENABLE_FREE_CHECK )
         ok( !memcmp( ptr0 + alloc_size + tail_size, padd_buf, 2 * sizeof(void *) ), "unexpected padding\n" );

tmp_ptr = (void *)0xdeadbeef;
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index ef1a9c3f3b1..38c39368896 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -501,7 +501,7 @@ static inline void mark_block_tail( struct block *block, DWORD flags )
     {
         if (flags & HEAP_TAIL_CHECKING_ENABLED || RUNNING_ON_VALGRIND) tail += BLOCK_ALIGN;
         valgrind_make_writable( tail + sizeof(void *), sizeof(void *) );
-        memset( tail + sizeof(void *), 0, sizeof(void *) );
+        memset( tail, 0, BLOCK_ALIGN );
     }
 }