Skip to content

W
wine-winehq
Commit e0ea2318 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

kernelbase: Validate pointers before calling heap functions.

parent c7eb844c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/kernelbase/memory.c
View file @ e0ea2318
......@@ -903,7 +903,8 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle )
TRACE_(globalmem)( "handle %p\n", handle );
RtlLockHeap( heap );
if ((ptr = unsafe_ptr_from_HLOCAL( handle )))
if ((ptr = unsafe_ptr_from_HLOCAL( handle )) &&
HeapValidate( heap, HEAP_NO_SERIALIZE, ptr ))
{
if (HeapFree( heap, HEAP_NO_SERIALIZE, ptr )) ret = 0;
}
......@@ -985,7 +986,8 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f
if (flags & LMEM_ZEROINIT) heap_flags |= HEAP_ZERO_MEMORY;
RtlLockHeap( heap );
if ((ptr = unsafe_ptr_from_HLOCAL( handle )))
if ((ptr = unsafe_ptr_from_HLOCAL( handle )) &&
HeapValidate( heap, HEAP_NO_SERIALIZE, ptr ))
{
if (flags & LMEM_MODIFY) ret = handle;
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment