- RtlReAllocateHeap shouldn't allocate memory if ptr == NULL.

svn path=/trunk/; revision=10725

diff --git a/reactos/lib/crtdll/stdlib/malloc.c b/reactos/lib/crtdll/stdlib/malloc.c
index 496affc..e72b7cc 100644 (file)
--- a/reactos/lib/crtdll/stdlib/malloc.c
+++ b/reactos/lib/crtdll/stdlib/malloc.c
@@ -31,5 +31,7 @@ void* calloc(size_t _nmemb, size_t _size)
  */
 void* realloc(void* _ptr, size_t _size)
 {
  */
 void* realloc(void* _ptr, size_t _size)
 {

+   if (!_ptr)
+      return(HeapAlloc(GetProcessHeap(),0,_size));

    return(HeapReAlloc(GetProcessHeap(),0,_ptr,_size));
 }
    return(HeapReAlloc(GetProcessHeap(),0,_ptr,_size));
 }

diff --git a/reactos/lib/kernel32/misc/console.c b/reactos/lib/kernel32/misc/console.c
index 573c4e0..b93f0c8 100644 (file)
--- a/reactos/lib/kernel32/misc/console.c
+++ b/reactos/lib/kernel32/misc/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.78 2004/08/24 17:21:11 navaraf Exp $
+/* $Id: console.c,v 1.79 2004/08/28 22:14:08 navaraf Exp $

  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries


@@ -2682,11 +2682,17 @@ AddConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine)
   else
     {
       NrCtrlHandlers++;
   else
     {
       NrCtrlHandlers++;

-      CtrlHandlers = 
-       RtlReAllocateHeap(RtlGetProcessHeap(),
-                          HEAP_ZERO_MEMORY,
-                          (PVOID)CtrlHandlers,
-                          NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); 
+      if (CtrlHandlers == NULL)
+        {
+          CtrlHandlers = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,
+                                         NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); 
+        }
+      else
+        {
+          CtrlHandlers = RtlReAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,
+                                           (PVOID)CtrlHandlers,
+                                           NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); 
+        }

       if (CtrlHandlers == NULL)
        {
          NrCtrlHandlers = 0;
       if (CtrlHandlers == NULL)
        {
          NrCtrlHandlers = 0;

diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c
index c5f7c53..755d813 100644 (file)
--- a/reactos/lib/rtl/heap.c
+++ b/reactos/lib/rtl/heap.c
@@ -1296,7 +1296,7 @@ LPVOID STDCALL RtlReAllocateHeap(
    SUBHEAP *subheap;
 
    if (!ptr)
    SUBHEAP *subheap;
 
    if (!ptr)

-      return RtlAllocateHeap( heap, flags, size );  /* FIXME: correct? */
+      return FALSE;

    if (!(heapPtr = HEAP_GetPtr( heap )))
       return FALSE;
 
    if (!(heapPtr = HEAP_GetPtr( heap )))
       return FALSE;