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

Timestamp:

Oct 22, 1999, 8:07:24 PM (26 years ago)

Author:

sandervl

Message:

exception handler changes + EB's HeapReAlloc fix

File:

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

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.11 1999-10-04 09:55:56 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.12 1999-10-22 18:07:21 sandervl Exp $ */
 
 /*
@@ -262 +262 @@
   HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
   LPVOID lpNewMem;
-  int    i;
+  int    i, oldSize;
 
   if (dwBytes == 0) return NULL;         // intercept stupid parameters
@@ -277 +277 @@
   }
 
-  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));
+  oldSize = Size(0,lpMem);
+  if (oldSize == dwBytes) return lpMem; // if reallocation with same size
+                                        // don't do anything
   lpNewMem = Alloc(dwFlags, dwBytes);
-  memcpy(lpNewMem, lpMem, Size(0, lpMem));
+  memcpy(lpNewMem, lpMem, dwBytes < oldSize ? dwBytes : oldSize);
   Free(0, lpMem);
 
-  dassert(lpNewMem, ("OS2Heap::ReAlloc, no more memory left\n"));
+  if(lpNewMem == NULL)
+  {
+     dprintf(("OS2Heap::ReAlloc, no more memory left\n"));
+  }
 
   return(lpNewMem);