Check for valid object in GDI_GetObjPtr even for MAGIC_DONTCARE.

89b415f7 · Alexandre Julliard · c3f2a140 · 89b415f7
Commit 89b415f7 authored Aug 27, 2001 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

gdiobj.c objects/gdiobj.c +8 -3

No files found.
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -390,10 +390,15 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD magic )
    if (handle & 2)  /* GDI heap handle */
    {
        ptr = (GDIOBJHDR *)LOCAL_Lock( GDI_HeapSel, handle );
-        if (ptr && (magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic))
+        if (ptr)
        {
-            LOCAL_Unlock( GDI_HeapSel, handle );
-            ptr = NULL;
+            if (((magic != MAGIC_DONTCARE) && (GDIMAGIC(ptr->wMagic) != magic)) ||
+                (GDIMAGIC(ptr->wMagic) < FIRST_MAGIC) ||
+                (GDIMAGIC(ptr->wMagic) > LAST_MAGIC))
+            {
+                LOCAL_Unlock( GDI_HeapSel, handle );
+                ptr = NULL;
+            }
        }
    }
    else  /* large heap handle */