Attachment #139016 for bug #202542




/* mark a block of memory as uninitialized for debugging purposes */
static inline void mark_block_uninitialized( void *ptr, SIZE_T size )
{
#ifdef VALGRIND_MAKE_MEM_UNDEFINED
    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
#endif
    if (TRACE_ON(heap) || WARN_ON(heap))
    {
        memset( ptr, ARENA_INUSE_FILLER, size );
#ifdef VALGRIND_MAKE_MEM_UNDEFINED
        /* make it uninitialized to valgrind again */
        VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
#endif
    }
}

Lines 937-943 static EXCEPTION_RECORD setup_exception( SIGCONTEXT sigcontext, raise_func fun Link Here

(-)a/dlls/ntdll/signal_i386.c (-1 / +1 lines)
937		937
938	stack--; /* push the stack_layout structure */	938	stack--; /* push the stack_layout structure */
939	#ifdef HAVE_VALGRIND_MEMCHECK_H	939	#ifdef HAVE_VALGRIND_MEMCHECK_H
940	VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));	940	VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack));
941	#endif	941	#endif
942	stack->ret_addr = (void )0xdeadbabe; / raise_func must not return */	942	stack->ret_addr = (void )0xdeadbabe; / raise_func must not return */
943	stack->rec_ptr = &stack->rec;	943	stack->rec_ptr = &stack->rec;

Return to bug 202542

Lines 156-170 static inline void mark_block_initialized( void *ptr, SIZE_T size ) Link Here

(-)a/dlls/ntdll/heap.c (-4 / +4 lines)
156	/* mark a block of memory as uninitialized for debugging purposes */	156	/* mark a block of memory as uninitialized for debugging purposes */
157	static inline void mark_block_uninitialized( void *ptr, SIZE_T size )	157	static inline void mark_block_uninitialized( void *ptr, SIZE_T size )
158	{	158	{
159	#ifdef VALGRIND_MAKE_WRITABLE	159	#ifdef VALGRIND_MAKE_MEM_UNDEFINED
160	VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));	160	VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
161	#endif	161	#endif
162	if (TRACE_ON(heap) \|\| WARN_ON(heap))	162	if (TRACE_ON(heap) \|\| WARN_ON(heap))
163	{	163	{
164	memset( ptr, ARENA_INUSE_FILLER, size );	164	memset( ptr, ARENA_INUSE_FILLER, size );
165	#ifdef VALGRIND_MAKE_WRITABLE	165	#ifdef VALGRIND_MAKE_MEM_UNDEFINED
166	/* make it uninitialized to valgrind again */	166	/* make it uninitialized to valgrind again */
167	VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));	167	VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
168	#endif	168	#endif
169	}	169	}
170	}	170	}