From 5c557d38ed349266c22bfdf0d800f6e873921885 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Tue, 22 Apr 2014 14:26:26 +0000 Subject: change mallocarray to reallocarray. useful in a few more situations. malloc can, as always, be emulated via realloc(NULL). ok deraadt --- src/lib/libc/stdlib/malloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libc/stdlib/malloc.c') diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index b48dcb3978..5790781733 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.154 2014/04/21 13:17:32 deraadt Exp $ */ +/* $OpenBSD: malloc.c,v 1.155 2014/04/22 14:26:26 tedu Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -1433,14 +1433,14 @@ calloc(size_t nmemb, size_t size) } void * -mallocarray(size_t nmemb, size_t size) +reallocarray(void *optr, size_t nmemb, size_t size) { if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && nmemb > 0 && SIZE_MAX / nmemb < size) { errno = ENOMEM; return NULL; } - return malloc(size * nmemb); + return realloc(optr, size * nmemb); } static void * -- cgit v1.2.3-55-g6feb