From d73dbecf68eccc3ca11a8ff3bb03d05a12667c39 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 1 Oct 2007 19:55:20 +0200 Subject: [PATCH] ntdll: Clear heap blocks also for WARN_ON(heap). --- 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 fb7df123ac3..c763ac3cdfa 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -137,7 +137,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL qu /* mark a block of memory as free for debugging purposes */ static inline void mark_block_free( void *ptr, SIZE_T size ) { - if (TRACE_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); + if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); #ifdef VALGRIND_MAKE_NOACCESS VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif @@ -157,7 +157,7 @@ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) #ifdef VALGRIND_MAKE_WRITABLE VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif - if (TRACE_ON(heap)) + if (TRACE_ON(heap) || WARN_ON(heap)) { memset( ptr, ARENA_INUSE_FILLER, size ); #ifdef VALGRIND_MAKE_WRITABLE