summaryrefslogtreecommitdiff
path: root/src/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authortedu <>2014-04-22 14:26:26 +0000
committertedu <>2014-04-22 14:26:26 +0000
commit5c557d38ed349266c22bfdf0d800f6e873921885 (patch)
treec8c9415e75220dc3ffecdcd042ee356dc6051ba3 /src/lib/libc/stdlib/malloc.c
parent83c4dbaf581d987510fb450e4e68af50d52c6f99 (diff)
downloadopenbsd-5c557d38ed349266c22bfdf0d800f6e873921885.tar.gz
openbsd-5c557d38ed349266c22bfdf0d800f6e873921885.tar.bz2
openbsd-5c557d38ed349266c22bfdf0d800f6e873921885.zip
change mallocarray to reallocarray. useful in a few more situations.
malloc can, as always, be emulated via realloc(NULL). ok deraadt
Diffstat (limited to 'src/lib/libc/stdlib/malloc.c')
-rw-r--r--src/lib/libc/stdlib/malloc.c6
1 files changed, 3 insertions, 3 deletions
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 @@
1/* $OpenBSD: malloc.c,v 1.154 2014/04/21 13:17:32 deraadt Exp $ */ 1/* $OpenBSD: malloc.c,v 1.155 2014/04/22 14:26:26 tedu Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1433,14 +1433,14 @@ calloc(size_t nmemb, size_t size)
1433} 1433}
1434 1434
1435void * 1435void *
1436mallocarray(size_t nmemb, size_t size) 1436reallocarray(void *optr, size_t nmemb, size_t size)
1437{ 1437{
1438 if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && 1438 if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
1439 nmemb > 0 && SIZE_MAX / nmemb < size) { 1439 nmemb > 0 && SIZE_MAX / nmemb < size) {
1440 errno = ENOMEM; 1440 errno = ENOMEM;
1441 return NULL; 1441 return NULL;
1442 } 1442 }
1443 return malloc(size * nmemb); 1443 return realloc(optr, size * nmemb);
1444} 1444}
1445 1445
1446static void * 1446static void *