commit de12a970416aafa1fe4a2966f74b4958e6dbab4c
author Oleg Prokhorov <xolegpro@rbcmail.ru> Tue Oct 14 05:24:20 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 14 05:24:20 2003 +0000
tree 7b90e8871c16206d60c91cbba8a94468d8a15353
parent 46f29944c3232601102a509a162d76eb57d2053f

Another portion of HeapReAlloc fixes.

dlls/kernel/global16.c

diff --git a/dlls/kernel/global16.c b/dlls/kernel/global16.c
index a21c7c2..76641e5 100644
--- a/dlls/kernel/global16.c
+++ b/dlls/kernel/global16.c
@@ -352,10 +352,16 @@
          * given out by GetVDMPointer32W16),
          * only try to realloc in place
          */
-        newptr = HeapReAlloc( GetProcessHeap(),
-                              (pArena->pageLockCount > 0) ? 
-                              HEAP_REALLOC_IN_PLACE_ONLY : 0, 
+
+	if (ptr)
+            newptr = HeapReAlloc( GetProcessHeap(),
+		(pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0, 
                               ptr, size );
+	else
+            newptr = HeapAlloc( GetProcessHeap(),
+		(pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0, 
+                              size );
+
     }
 
     if (!newptr)