Changeset 6080 for trunk/src/kernel32/os2heap.cpp

Timestamp:

Jun 23, 2001, 10:43:17 AM (24 years ago)

Author:

sandervl

Message:

HeapSize must return -1 for invalid pointers

File:

• trunk/src/kernel32/os2heap.cpp (modified) (2 diffs)

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.17 2001-04-27 17:35:41 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.18 2001-06-23 08:43:17 sandervl Exp $ */
 
 /*
@@ -272 +272 @@
 DWORD OS2Heap::Size(DWORD dwFlags, PVOID lpMem)
 {
-//  dprintf(("OS2Heap::Size, %X\n", lpMem));
-  if(lpMem == NULL)
-    return(0);
+ HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
+
+  if(lpMem == NULL) {
+        dprintf(("OS2Heap::Size lpMem == NULL\n"));
+        return -1;
+  }
+  /* verify lpMem address */
+  if (lpMem >= (LPVOID)ulMaxAddr || lpMem < (LPVOID)0x10000)
+  {
+        dprintf(("OS2Heap::Size ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return -1;
+  }
+
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+        dprintf(("OS2Heap::Size ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return -1;
+  }
 
   return(_msize((char *)lpMem - sizeof(HEAPELEM)) - HEAP_OVERHEAD);