From 657a5fbc0d0aff309079ff8fb386f17e964963c2 Mon Sep 17 00:00:00 2001 From: "deraadt@openbsd.org" Date: Fri, 24 Apr 2015 01:36:00 +0000 Subject: upstream commit rename xrealloc() to xreallocarray() since it follows that form. ok djm --- xmalloc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'xmalloc.c') diff --git a/xmalloc.c b/xmalloc.c index cd59dc2e5..98cbf8776 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.31 2015/02/06 23:21:59 millert Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.32 2015/04/24 01:36:01 deraadt Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -56,22 +56,14 @@ xcalloc(size_t nmemb, size_t size) } void * -xrealloc(void *ptr, size_t nmemb, size_t size) +xreallocarray(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_MAX / nmemb < size) - fatal("xrealloc: nmemb * size > SIZE_MAX"); - if (ptr == NULL) - new_ptr = malloc(new_size); - else - new_ptr = realloc(ptr, new_size); + new_ptr = reallocarray(ptr, nmemb, size); if (new_ptr == NULL) - fatal("xrealloc: out of memory (new_size %zu bytes)", - new_size); + fatal("xreallocarray: out of memory (%zu elements of %zu bytes)", + nmemb, size); return new_ptr; } -- cgit v1.2.3