Skip to content

W
wine-winehq
Commit 89b415f7 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Check for valid object in GDI_GetObjPtr even for MAGIC_DONTCARE.

parent c3f2a140
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
objects/gdiobj.c
View file @ 89b415f7
...@@ -390,10 +390,15 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD magic ) ...@@ -390,10 +390,15 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD magic )
if (handle & 2) /* GDI heap handle */ if (handle & 2) /* GDI heap handle */
{ {
ptr = (GDIOBJHDR *)LOCAL_Lock( GDI_HeapSel, handle ); ptr = (GDIOBJHDR *)LOCAL_Lock( GDI_HeapSel, handle );
if (ptr && (magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) if (ptr)
{ {
LOCAL_Unlock( GDI_HeapSel, handle ); if (((magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) ||
ptr = NULL; (GDIMAGIC(ptr->wMagic) < FIRST_MAGIC) ||
(GDIMAGIC(ptr->wMagic) > LAST_MAGIC))
{
LOCAL_Unlock( GDI_HeapSel, handle );
ptr = NULL;
}
} }
} }
else /* large heap handle */ else /* large heap handle */
......
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