- (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from

[openssh.git] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index dcb3d4eddb954d4fb20a34f4cae163f477375fa9..99c6ac3301ae9494c23ce59eedfc1722e7d2ed86 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -2,22 +2,32 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * Created: Mon Mar 20 21:23:10 1995 ylo
  * Versions of malloc and friends that check their results, and never return
  * failure (they call fatal if they encounter an error).
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");
 
-#include "ssh.h"
+#include "xmalloc.h"
+#include "log.h"
 
 void *
 xmalloc(size_t size)
 {
-       void *ptr = malloc(size);
+       void *ptr;
+
+       if (size == 0)
+               fatal("xmalloc: zero size");
+       ptr = malloc(size);
        if (ptr == NULL)
-               fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);
+               fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);
        return ptr;
 }
 
@@ -26,11 +36,14 @@ xrealloc(void *ptr, size_t new_size)
 {
        void *new_ptr;
 
+       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 %d bytes)", (int) new_size);
+               fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
        return new_ptr;
 }
 
@@ -45,9 +58,11 @@ xfree(void *ptr)
 char *
 xstrdup(const char *str)
 {
-       int len = strlen(str) + 1;
+       size_t len;
+       char *cp;
 
-       char *cp = xmalloc(len);
+       len = strlen(str) + 1;
+       cp = xmalloc(len);
        strlcpy(cp, str, len);
        return cp;
 }