- deraadt@cvs.openbsd.org 2001/04/16 08:05:34

     [xmalloc.c]
     xrealloc dealing with ptr == nULL; mouring

diff --git a/ChangeLog b/ChangeLog
index 2be0fc7a951b749add53984b0a2b0d7dafbb3e7f..3085994b033eab2fc4cd65817c6bcfaa8ddd56fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
      [scp.c sftp.c]
      IPv6 support for sftp (which I bungled in my last patch) which is
      borrowed from scp.c.  Thanks to Markus@ for pointing it out.
+   - deraadt@cvs.openbsd.org 2001/04/16 08:05:34
+     [xmalloc.c]
+     xrealloc dealing with ptr == nULL; mouring
 
 20010415
  - OpenBSD CVS Sync

diff --git a/xmalloc.c b/xmalloc.c
index 8a23b8b70ffd700854739bb059f85b1ba9cd1335..5046627490769c3a9926f800b001c2a3bf0fa93b 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.14 2001/02/07 18:04:50 itojun Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.15 2001/04/16 08:05:34 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -39,8 +39,9 @@ xrealloc(void *ptr, size_t new_size)
        if (new_size == 0)
                fatal("xrealloc: zero size");
        if (ptr == NULL)
-               fatal("xrealloc: NULL pointer given as argument");
-       new_ptr = realloc(ptr, new_size);
+               new_ptr = malloc(new_size);
+       else
+               new_ptr = realloc(ptr, new_size);
        if (new_ptr == NULL)
                fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
        return new_ptr;