From 7f4b6766553610eb1e25e02d5e86fe9a96a5e296 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 25 Dec 2014 18:30:33 +0100 Subject: update, keep gzsig inspite of being removed upstream. --- src/liboutils/outils.h | 3 +-- src/liboutils/reallocarray.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/liboutils/reallocarray.c (limited to 'src/liboutils') diff --git a/src/liboutils/outils.h b/src/liboutils/outils.h index 473b0a1..c949525 100644 --- a/src/liboutils/outils.h +++ b/src/liboutils/outils.h @@ -23,5 +23,4 @@ uint32_t arc4random(void); uint32_t arc4random_uniform(uint32_t); void arc4random_buf(void *, size_t); int timingsafe_bcmp(const void *, const void *, size_t); - - +void *reallocarray(void *, size_t, size_t); diff --git a/src/liboutils/reallocarray.c b/src/liboutils/reallocarray.c new file mode 100644 index 0000000..ed3244e --- /dev/null +++ b/src/liboutils/reallocarray.c @@ -0,0 +1,38 @@ +/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek + * + * 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 +#include +#include +#include + +/* + * 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); +} -- cgit 1.4.1