diff options
Diffstat (limited to 'src/lib/libc/stdlib/malloc.c')
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 6f2a48ba4c..a015fa229b 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.160 2014/05/07 20:07:59 halex Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.161 2014/05/08 21:43:49 deraadt 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> |
@@ -1424,17 +1424,6 @@ calloc(size_t nmemb, size_t size) | |||
1424 | return r; | 1424 | return r; |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | void * | ||
1428 | reallocarray(void *optr, size_t nmemb, size_t size) | ||
1429 | { | ||
1430 | if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && | ||
1431 | nmemb > 0 && SIZE_MAX / nmemb < size) { | ||
1432 | errno = ENOMEM; | ||
1433 | return NULL; | ||
1434 | } | ||
1435 | return realloc(optr, size * nmemb); | ||
1436 | } | ||
1437 | |||
1438 | static void * | 1427 | static void * |
1439 | mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) | 1428 | mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) |
1440 | { | 1429 | { |