diff options
| author | Benjamin Baier <programmer@netzbasis.de> | 2014-06-27 02:05:11 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2014-07-17 05:13:05 +0200 |
| commit | faa005cb3209239bdbdf001e387cbcf9f088b12c (patch) | |
| tree | def6e8cd0b2ba6869e2246c56e6d143e62658fb9 /src | |
| parent | 36aca8c06ee6b41e917eb4f70622831852ad72f7 (diff) | |
Add reallocarray() function from OpenBSD
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libbsd.map | 2 | ||||
| -rw-r--r-- | src/reallocarray.c | 38 |
3 files changed, 41 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 950e47b..b9ff0bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,7 @@ libbsd_la_SOURCES = \ progname.c \ radixsort.c \ readpassphrase.c \ + reallocarray.c \ reallocf.c \ setmode.c \ setproctitle.c \ diff --git a/src/libbsd.map b/src/libbsd.map index 35eb374..29e84fd 100644 --- a/src/libbsd.map +++ b/src/libbsd.map @@ -116,6 +116,8 @@ LIBBSD_0.7 { funopen; + reallocarray; + sl_init; sl_add; sl_free; diff --git a/src/reallocarray.c b/src/reallocarray.c new file mode 100644 index 0000000..7accd99 --- /dev/null +++ b/src/reallocarray.c @@ -0,0 +1,38 @@ +/* $OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <errno.h> +#include <stdint.h> +#include <stdlib.h> + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4)) + +void * +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 realloc(optr, size * nmemb); +} |