0a1
> /* $OpenBSD: xmalloc.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */
16d16
< RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");
17a18,23
> #include <sys/param.h>
> #include <stdarg.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>
35c41
< xrealloc(void *ptr, size_t new_size)
---
> xcalloc(size_t nmemb, size_t size)
36a43,58
> 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)
> {
37a60
> size_t new_size = nmemb * size;
40a64,65
> if (SIZE_T_MAX / nmemb < size)
> fatal("xrealloc: nmemb * size > SIZE_T_MAX");
46c71,72
< 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);
68a95,110
>
> 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);
> }