Added null check in GlobalHandle.

98679974 · Guy Albertelli · Alexandre Julliard · afa43155 · 98679974
Commit 98679974 authored Jan 15, 2000 by Guy Albertelli Committed by Alexandre Julliard Jan 15, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

global.c memory/global.c +8 -1

No files found.
--- a/memory/global.c
+++ b/memory/global.c
@@ -1141,7 +1141,14 @@ HGLOBAL WINAPI GlobalHandle(
                 LPCVOID pmem /* [in] Pointer to global memory block */
 ) {
    HGLOBAL handle;
-    HANDLE heap = GLOBAL_GetHeap( POINTER_TO_HANDLE(pmem) );
+    HANDLE heap;
+
+    if (!pmem)
+    {
+       SetLastError( ERROR_INVALID_PARAMETER );
+       return 0;
+    }
+    heap = GLOBAL_GetHeap( POINTER_TO_HANDLE(pmem) );

    if (!HEAP_IsInsideHeap( heap, 0, pmem )) goto error;
    handle = POINTER_TO_HANDLE(pmem);