- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index 738c9cdc390265a6f01f24b30bef79e87a8c8fc2..9985b4cc2a3494cc89c1c6e3242b95de88712246 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,10 +1,11 @@
+/* $OpenBSD: xmalloc.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
  * 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
@@ -13,29 +14,62 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.8 2000/09/07 20:27:55 deraadt Exp $");
 
-#include "ssh.h"
+#include <sys/param.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 *
-xrealloc(void *ptr, size_t new_size)
+xcalloc(size_t nmemb, size_t size)
+{
+       void *ptr;
+
+       if (size == 0 || nmemb == 0)
+               fatal("xcalloc: zero size");
+       if (SIZE_T_MAX / nmemb < size)
+               fatal("xcalloc: nmemb * size > SIZE_T_MAX");
+       ptr = calloc(nmemb, size);
+       if (ptr == NULL)
+               fatal("xcalloc: out of memory (allocating %lu bytes)",
+                   (u_long)(size * nmemb));
+       return ptr;
+}
+
+void *
+xrealloc(void *ptr, size_t nmemb, size_t size)
 {
        void *new_ptr;
+       size_t new_size = nmemb * size;
 
+       if (new_size == 0)
+               fatal("xrealloc: zero size");
+       if (SIZE_T_MAX / nmemb < size)
+               fatal("xrealloc: nmemb * size > SIZE_T_MAX");
        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;
 }
 
@@ -50,9 +84,27 @@ 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;
 }
+
+int
+xasprintf(char **ret, const char *fmt, ...)
+{
+       va_list ap;
+       int i;
+
+       va_start(ap, fmt);
+       i = vasprintf(ret, fmt, ap);
+       va_end(ap);
+
+       if (i < 0 || *ret == NULL)
+               fatal("xasprintf: could not allocate memory");
+
+       return (i);
+}