remove acconfig.h

[openssh.git] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index 8a23b8b70ffd700854739bb059f85b1ba9cd1335..99c6ac3301ae9494c23ce59eedfc1722e7d2ed86 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.16 2001/07/23 18:21:46 stevesk 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;
@@ -57,11 +58,10 @@ xfree(void *ptr)
 char *
 xstrdup(const char *str)
 {
-       size_t len = strlen(str) + 1;
+       size_t len;
        char *cp;
 
-       if (len == 0)
-               fatal("xstrdup: zero size");
+       len = strlen(str) + 1;
        cp = xmalloc(len);
        strlcpy(cp, str, len);
        return cp;