1 files changed, 45 insertions, 3 deletions

diff --git a/xmalloc.c b/xmalloc.c
index 99c6ac330..9985b4cc2 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,3 +1,4 @@
+/* $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
@@ -13,7 +14,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");
+
+#include <sys/param.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "xmalloc.h"
 #include "log.h"
@@ -32,18 +38,38 @@ xmalloc(size_t size)
 }
 
 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)
                 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);
+                fatal("xrealloc: out of memory (new_size %lu bytes)",
+                    (u_long) new_size);
         return new_ptr;
 }
 
@@ -66,3 +92,19 @@ xstrdup(const char *str)
         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);
+}