Changeset 6240 for trunk/src/kernel32/heap.cpp

Timestamp:

Jul 8, 2001, 9:14:45 AM (24 years ago)

Author:

sandervl

Message:

More pointer checks added to GlobalLock/Unlock

File:

• trunk/src/kernel32/heap.cpp (modified) (4 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.30 2001-07-06 19:03:42 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.31 2001-07-08 07:14:45 sandervl Exp $ */
 
 /*
@@ -289 +289 @@
 
 
+   /* verify lpMem address */
+   if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)
+   {
+        dprintf(("GlobalLock ERROR BAD HEAP POINTER:%X\n", hmem));
+        DebugInt3();
+        return 0;
+   }
+
    if(hmem == NULL || ISPOINTER(hmem)) {
       dprintf(("KERNEL32: GlobalLock %x returned %x", hmem, hmem));
@@ -329 +337 @@
 
    dprintf(("KERNEL32: GlobalUnlock %x", hmem));
+
+   /* verify lpMem address */
+   if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)
+   {
+        dprintf(("GlobalUnlock ERROR BAD HEAP POINTER:%X\n", hmem));
+        DebugInt3();
+        return 0;
+   }
 
    if(hmem == NULL || ISPOINTER(hmem))
@@ -574 +590 @@
    {
         dprintf(("GlobalFree ERROR BAD HEAP POINTER:%X\n", hmem));
+        DebugInt3();
         return 0;
    }