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

Timestamp:

Oct 4, 1999, 11:56:04 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes by several people (see changelog for 4 October

File:

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

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.10 1999-10-01 16:03:10 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.11 1999-10-04 09:55:56 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
   heapelem->flags   = 0;    //only used when allocated with LocalAlloc
   heapelem->lockCnt = 0;    //..    ..
+  heapelem->magic   = MAGIC_NR_HEAP;
 
   if(hmutex) {
@@ -179 +180 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::Lock ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   helem->lockCnt++;
 
@@ -195 +202 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::UnLock ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   helem->lockCnt--;
 
@@ -208 +221 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::GetFlags ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   return(helem->flags);
 }
@@ -219 +238 @@
     return(666);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::GetLockCnt ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   return(helem->lockCnt);
 }
@@ -235 +260 @@
 LPVOID OS2Heap::ReAlloc(DWORD dwFlags, LPVOID lpMem, DWORD dwBytes)
 {
+  HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
   LPVOID lpNewMem;
   int    i;
@@ -245 +271 @@
 //  if (lpMem == 0)   return NULL;
 
+  if (helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::ReAlloc ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return lpMem;
+  }
+
   if (Size(0,lpMem) == dwBytes) return lpMem; // if reallocation with same size
                                                 // don't do anything
@@ -267 +299 @@
     return(FALSE);
   }
+
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
 #ifdef DEBUG1
   int size = Size(0, lpMem);