diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-07-28 16:27:42 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-07-28 16:27:42 -0700 |
commit | 6228bc837a1bfd806c6b6f92fea9f6a42f099e7e (patch) | |
tree | 8bd744e2835403d769bd59e69ffb98dd3698e890 /lib | |
parent | 86ca4f322bbec8f52a76c1bf2a879bf464d9bb65 (diff) | |
parent | 609af5775f7277679dc3bd966b36f04cf7ccf2a8 (diff) |
merge tag v2.6.1
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lib.c | 4 | ||||
-rw-r--r-- | lib/reallocarray.c | 49 |
2 files changed, 52 insertions, 1 deletions
@@ -3,5 +3,7 @@ * moving something that flex treats as a library function into this * directory. */ -void do_nothing(){ return;} +extern void do_nothing(void); + +void do_nothing(void){ return;} diff --git a/lib/reallocarray.c b/lib/reallocarray.c new file mode 100644 index 0000000..0c1e250 --- /dev/null +++ b/lib/reallocarray.c @@ -0,0 +1,49 @@ +/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook 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. + */ + +/* OPENBSD ORIGINAL: lib/libc/stdlib/reallocarray.c */ + +#include <config.h> +#ifndef HAVE_REALLOCARRAY +#undef reallocarray + +#include <sys/types.h> +#include <errno.h> +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif +#include <stdlib.h> + +void *reallocarray(void *, size_t, size_t); + +/* + * 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 ((size_t)1 << (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); +} +#endif /* HAVE_REALLOCARRAY */ |