commit - b5c4cc839e3178788f0203eb2cde9d0bf8fc0b76
commit + 2dfdd11a40cc7c2f468c0b614f7d0aaffa1c6074
blob - /dev/null
blob + a12eb220f52fd230cbbec83e2892133a6dcbeaeb (mode 644)
--- /dev/null
+++ compat/reallocarray.c
@@ -0,0 +1,40 @@
+/*	$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 "compat.h"
+
+#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 - 781f3e5ff4a5e1201ee8b90c39e3249b0619b142
blob + 26d79ad516c9ee5727086af7af2c6661fca3a0c8
--- compat.h
+++ compat.h
@@ -111,6 +111,10 @@ const char	*getprogname(void);
 void		*memmem(const void *, size_t, const void *, size_t);
 #endif
 
+#ifndef HAVE_REALLOCARRAY
+void		*reallocarray(void *, size_t, size_t);
+#endif
+
 #ifndef HAVE_RECALLOCARRAY
 void		*recallocarray(void *, size_t, size_t, size_t);
 #endif
blob - ee80ab68b333672c811ccb7e5c9c33368c7b1bde
blob + 50e5021fb6f3a284d445dacc80f7529fa2f751f6
--- configure.ac
+++ configure.ac
@@ -62,6 +62,7 @@ AC_REPLACE_FUNCS([
 	getdtablesize	\
 	getprogname	\
 	memmem		\
+	reallocarray	\
 	recallocarray	\
 	setproctitle	\
 	setprogname	\