Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 202542 | Differences between
and this patch

Collapse All | Expand All

(-)dlls/ntdll/heap.c.old (+8 lines)
Lines 142-147 Link Here
142 
    if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size );
 142 
    if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size );
143 
#ifdef VALGRIND_MAKE_NOACCESS
 143 
#ifdef VALGRIND_MAKE_NOACCESS
144 
    VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ));
 144 
    VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ));
145 
#elif defined(VALGRIND_MAKE_MEM_NOACCESS)
146 
    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size ));
145 
#endif
 147 
#endif
146 
}
 148 
}
147 

          149
          

        

  

    
      
            Lines 150-155
          
      
      
        Link Here
      
    
  

        

          150
          
{

          152
          
{

        

        

          151
          
#ifdef VALGRIND_MAKE_READABLE

          153
          
#ifdef VALGRIND_MAKE_READABLE

        

        

          152
          
    VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ));

          154
          
    VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ));

        

            

              
              
              155
              
#elif defined(VALGRIND_MAKE_MEM_DEFINED)

            

            

              156
              
    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ));

            

        

          153
          
#endif

          157
          
#endif

        

        

          154
          
}

          158
          
}

        

        

          155
          

          159
          

        

  

    
      
            Lines 158-163
          
      
      
        Link Here
      
    
  

        

          158
          
{

          162
          
{

        

        

          159
          
#ifdef VALGRIND_MAKE_WRITABLE

          163
          
#ifdef VALGRIND_MAKE_WRITABLE

        

        

          160
          
    VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));

          164
          
    VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));

        

            

              
              
              165
              
#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)

            

            

              166
              
    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));

            

        

          161
          
#endif

          167
          
#endif

        

        

          162
          
    if (TRACE_ON(heap) || WARN_ON(heap))

          168
          
    if (TRACE_ON(heap) || WARN_ON(heap))

        

        

          163
          
    {

          169
          
    {

        

  

    
      
            Lines 165-170
          
      
      
        Link Here
      
    
  

        

          165
          
#ifdef VALGRIND_MAKE_WRITABLE

          171
          
#ifdef VALGRIND_MAKE_WRITABLE

        

        

          166
          
        /* make it uninitialized to valgrind again */

          172
          
        /* make it uninitialized to valgrind again */

        

        

          167
          
        VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));

          173
          
        VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));

        

            

              
              
              174
              
#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)

            

            

              175
              
	VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));

            

        

          168
          
#endif

          176
          
#endif

        

        

          169
          
    }

          177
          
    }

        

        

          170
          
}

          178
          
}

        



(-)dlls/ntdll/signal_i386.c.old
      (-1 / +3 lines)




  

    
      
            Lines 936-943
          
      
      
        Link Here
      
    
  

        

          936
          
    }

          936
          
    }

        

        

          937
          

          937
          

        

        

          938
          
    stack--;  /* push the stack_layout structure */

          938
          
    stack--;  /* push the stack_layout structure */

        

          
            

              939
              
#ifdef HAVE_VALGRIND_MEMCHECK_H


              939
              
#ifdef VALGRIND_MAKE_WRITABLE

            

        

          940
          
    VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));

          940
          
    VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));

        

            

              
              
              941
              
#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)

            

            

              942
              
     VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack));

            

        

          941
          
#endif

          943
          
#endif

        

        

          942
          
    stack->ret_addr     = (void *)0xdeadbabe;  /* raise_func must not return */

          944
          
    stack->ret_addr     = (void *)0xdeadbabe;  /* raise_func must not return */

        

        

          943
          
    stack->rec_ptr      = &stack->rec;

          945
          
    stack->rec_ptr      = &stack->rec;

        






  

  Return to bug 202542