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

Timestamp:

Apr 30, 2000, 6:31:47 PM (25 years ago)

Author:

sandervl

Message:

LocalGetFlags bugfix + some extra checks for invalid pointers

File:

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

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.14 2000-02-16 14:25:43 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.15 2000-04-30 16:31:47 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include "vmutex.h"
 #include "initterm.h"
+#include <odin32validate.h>
 
 #define DBG_LOCALLOG    DBG_os2heap
@@ -181 +182 @@
  HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
 
-  if(lpMem == NULL)
-    return(FALSE);
+  if((ULONG)lpMem > ADDRESS_SPACE_LIMIT) {
+        //SvL: Some apps lock and unlock gdi handles; just ignore this here
+        dprintf(("Lock: invalid address %x", lpMem));
+        return FALSE;
+  }
+
+  if(lpMem == NULL)
+        return(FALSE);
 
   if(helem->magic != MAGIC_NR_HEAP)
   {
-    dprintf(("OS2Heap::Lock ERROR BAD HEAP POINTER:%X\n", lpMem));
-    return FALSE;
+        dprintf(("OS2Heap::Lock ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return FALSE;
   }
 
@@ -199 +206 @@
 {
  HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
+
+  if((ULONG)lpMem > ADDRESS_SPACE_LIMIT) {
+        //SvL: Some apps lock and unlock gdi handles; just ignore this here
+        dprintf(("Unlock: invalid address %x", lpMem));
+        return FALSE;
+  }
 
   if(lpMem == NULL)
@@ -223 +236 @@
 
   if(lpMem == NULL)
-    return(FALSE);
+    return(0);
 
   if(helem->magic != MAGIC_NR_HEAP)
   {
     dprintf(("OS2Heap::GetFlags ERROR BAD HEAP POINTER:%X\n", lpMem));
-    return FALSE;
-  }
-
-  return(helem->flags);
+    return 0;
+  }
+
+  return(helem->lockCnt | (helem->flags << 8));
 }
 //******************************************************************************
@@ -239 +252 @@
  HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
 
-  if(lpMem == NULL)
-    return(666);
+  if((ULONG)lpMem > ADDRESS_SPACE_LIMIT) {
+        //SvL: Some apps lock and unlock gdi handles; just ignore this here
+        dprintf(("GetLockCnt: invalid address %x", lpMem));
+        return FALSE;
+  }
+
+  if(lpMem == NULL)
+        return(0);
 
   if(helem->magic != MAGIC_NR_HEAP)
   {
-    dprintf(("OS2Heap::GetLockCnt ERROR BAD HEAP POINTER:%X\n", lpMem));
-    return FALSE;
+        dprintf(("OS2Heap::GetLockCnt ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return 0;
   }
 
@@ -302 +321 @@
 
   if(lpMem == NULL) {
-    dprintf(("OS2Heap::Free lpMem == NULL\n"));
-    return(FALSE);
+        dprintf(("OS2Heap::Free lpMem == NULL\n"));
+        return(FALSE);
   }
   /* verify lpMem address */
   if (lpMem >= (LPVOID)ulMaxAddr || lpMem < (LPVOID)0x10000)
   {
-    dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
-    return FALSE;
+        dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return FALSE;
   }
 
   if(helem->magic != MAGIC_NR_HEAP)
   {
-    dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
-    return FALSE;
+        dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
+        return FALSE;
   }
 
@@ -327 +346 @@
 
   if(helem->prev)
-    helem->prev->next = helem->next;
+        helem->prev->next = helem->next;
   if(helem->next)
-    helem->next->prev = helem->prev;
+        helem->next->prev = helem->prev;
   if(heapelem == helem)
-    heapelem = heapelem->next;
+        heapelem = heapelem->next;
 
   if(hmutex) {
-    hmutex->leave();
+        hmutex->leave();
   }