* 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.15 2001/04/16 08:05:34 deraadt 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;
}
{
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;
}
-void
+void
xfree(void *ptr)
{
if (ptr == NULL)
char *
xstrdup(const char *str)
{
- int len = strlen(str) + 1;
+ size_t len = strlen(str) + 1;
+ char *cp;
- char *cp = xmalloc(len);
+ if (len == 0)
+ fatal("xstrdup: zero size");
+ cp = xmalloc(len);
strlcpy(cp, str, len);
return cp;
}