Changeset 12356

Timestamp:

Nov 18, 1999, 10:21:34 AM (25 years ago)

Author:

bird

Message:

Added pointer check on lpMem in OS2Heap::Free. (This solved the WinZip 7.0
crash.)

File:

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

tags/trunk/src/kernel32/os2heap.cpp ¶

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.12 1999-10-22 18:07:21 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.13 1999-11-18 09:21:34 bird Exp $ */
 
 /*
@@ -8 +8 @@
  *
  * NOTE: ReAlloc allocates memory using Alloc if memory pointer == NULL
- *       WINE controls depend on this, even though it apparently 
+ *       WINE controls depend on this, even though it apparently
  *       doesn't work like this in Windows.
  *
@@ -26 +26 @@
 #include "misc.h"
 #include "vmutex.h"
+#include "initterm.h"
 
 #ifndef HEAP_NO_SERIALIZE
@@ -265 +266 @@
 
   if (dwBytes == 0) return NULL;         // intercept stupid parameters
- 
+
   //NOTE: Allocate memory using Alloc -> WINE controls depend on this, even
   //      though it apparently doesn't work in Windows.
@@ -300 +301 @@
     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;
   }