Alexandre Julliard : ntdll: Clear heap blocks also for WARN_ON(heap).
Alexandre Julliard
julliard at winehq.org
Tue Oct 2 06:52:37 CDT 2007
Module: wine
Branch: master
Commit: d73dbecf68eccc3ca11a8ff3bb03d05a12667c39
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73dbecf68eccc3ca11a8ff3bb03d05a12667c39
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 1 19:55:20 2007 +0200
ntdll: Clear heap blocks also for WARN_ON(heap).
---
dlls/ntdll/heap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index fb7df12..c763ac3 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
More information about the wine-cvs
mailing list