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

Timestamp:

Aug 3, 1999, 7:38:59 PM (26 years ago)

Author:

phaller

Message:

Fix: OS2Heap::ReAlloc() fixes for zero allocation and reallocation with same size

File:

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

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.4 1999-06-19 10:54:42 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.5 1999-08-03 17:38:59 phaller Exp $ */
 
 /*
@@ -216 +216 @@
 //******************************************************************************
 //******************************************************************************
+DWORD OS2Heap::Size(DWORD dwFlags, PVOID lpMem)
+{
+//  dprintf(("OS2Heap::Size, %X\n", lpMem));
+  if(lpMem == NULL)
+    return(0);
+
+  return(_msize((char *)lpMem - sizeof(HEAPELEM)) - HEAP_OVERHEAD);
+}
+//******************************************************************************
+//******************************************************************************
 LPVOID OS2Heap::ReAlloc(DWORD dwFlags, LPVOID lpMem, DWORD dwBytes)
 {
- LPVOID lpNewMem;
- int    i;
+  LPVOID lpNewMem;
+  int    i;
+
+  if (dwBytes == 0) return NULL;         // intercept stupid parameters
+  if (lpMem == 0)   return NULL;
+
+  if (Size(0,lpMem) == dwBytes) return lpMem; // if reallocation with same size
+                                                // don't do anything
 
 //  dprintf(("OS2Heap::ReAlloc %X %X %d\n", dwFlags, lpMem, dwBytes));
@@ -264 +280 @@
 //******************************************************************************
 //******************************************************************************
-DWORD OS2Heap::Size(DWORD dwFlags, PVOID lpMem)
-{
-//  dprintf(("OS2Heap::Size, %X\n", lpMem));
-  if(lpMem == NULL)
-    return(0);
-
-  return(_msize((char *)lpMem - sizeof(HEAPELEM)) - HEAP_OVERHEAD);
-}
-//******************************************************************************
-//******************************************************************************
 DWORD OS2Heap::Compact(DWORD dwFlags)
 {