Merge tag '1.4' into since

Version 1.4

1 files changed, 67 insertions, 0 deletions

diff --git a/ereallocarray.c b/ereallocarray.c
new file mode 100644
index 0000000..2d07ee0
--- /dev/null
+++ b/ereallocarray.c
@@ -0,0 +1,67 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+#ifndef TEST
+
+
+extern inline void *libsimple_ereallocarray(void *, size_t, size_t);
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	struct allocinfo *info;
+	void *ptr, *old;
+
+	assert((ptr = libsimple_ereallocarray(NULL, 1, 5)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 5);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+		info->refcount += 1;
+	}
+	stpcpy(ptr, "test");
+	assert((ptr = libsimple_ereallocarray(old = ptr, 10, 10)));
+	assert(!strcmp(ptr, "test"));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 100);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+		assert(ptr != old);
+		free(old);
+	}
+	free(ptr);
+
+	if (have_custom_malloc()) {
+		libsimple_default_failure_exit = 104;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_ereallocarray(NULL, 1, 1));
+		assert(exit_status == 104);
+		assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+	}
+
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Walloc-size-larger-than="
+#endif
+
+	libsimple_default_failure_exit = 4;
+	assert_exit_ptr(libsimple_ereallocarray(NULL, SIZE_MAX, SIZE_MAX));
+	assert(exit_status == 4);
+	assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
+	libsimple_default_failure_exit = 1;
+
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
+	return 0;
+}
+
+#endif