commit bfdc637cd940bf4b07066ff96bb48d8bc40e7134
from: Stefan Sperling <stsp@stsp.name>
date: Sun Sep 20 21:32:23 2020 UTC

add missing reallocarray(3) compat shim

commit - 18a9c7f892c7460bf71ec8b912cfbe3ac028aecd
commit + bfdc637cd940bf4b07066ff96bb48d8bc40e7134
blob - /dev/null
blob + 43f0b69158ac2a290dec1f45075d7b6f6a18678b (mode 644)
--- /dev/null
+++ compat/reallocarray.c
@@ -0,0 +1,38 @@
+/*	$OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther 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	((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);
+}
blob - dbf0f51f200f34e415f06d4604f088e14ea0a0e4
blob + 1b5c256b8e80cab7a4ed7e563349ee1ee5e2dd79
--- lib/GNUmakefile
+++ lib/GNUmakefile
@@ -10,7 +10,7 @@ SRCS = \
 
 # Compat sources
 VPATH=         $(CURDIR)/../compat
-SRCS+=         getprogname_linux.c recallocarray.c
+SRCS+=         getprogname_linux.c reallocarray.c recallocarray.c
 CFLAGS+=       -I$(CURDIR)/../compat/include
 
 OBJS = $(SRCS:.c=.o)