More tests and fix attributes on wcsndup

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 108 insertions, 1 deletions

diff --git a/enreallocarray.c b/enreallocarray.c
index c988994..c208626 100644
--- a/enreallocarray.c
+++ b/enreallocarray.c
@@ -4,7 +4,7 @@
 
 
 void *
-libsimple_enreallocarray(int status, void *ptr, size_t n, size_t m) /* TODO test */
+libsimple_enreallocarray(int status, void *ptr, size_t n, size_t m)
 {
 	void *ret = reallocarray(ptr, n, m);
 	if (!ret)
@@ -19,6 +19,113 @@ libsimple_enreallocarray(int status, void *ptr, size_t n, size_t m) /* TODO test
 int
 main(void)
 {
+	struct allocinfo *info;
+	void *ptr, *old;
+
+	assert((ptr = libsimple_enreallocarray(1, NULL, 5, 3)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 15);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+		info->refcount += 1;
+	}
+	stpcpy(ptr, "test");
+	assert((ptr = libsimple_enreallocarray(1, old = ptr, 10, 2)));
+	assert(!strcmp(ptr, "test"));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 20);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+		assert(ptr != old);
+		free(old);
+	}
+	free(ptr);
+
+	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);
+
+	assert((ptr = libsimple_reallocarray(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_reallocarray(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()) {
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_enreallocarray(2, NULL, 1, 1));
+		assert(exit_status == 2);
+		assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+
+		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;
+
+		alloc_fail_in = 1;
+		assert(!libsimple_reallocarray(NULL, 1, 1) && errno == ENOMEM);
+		assert(!alloc_fail_in);
+	}
+
+#if defined(__GNUC__) && !defined(__clang)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Walloc-size-larger-than="
+#endif
+
+	assert_exit_ptr(libsimple_enreallocarray(3, NULL, SIZE_MAX, SIZE_MAX));
+	assert(exit_status == 3);
+	assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
+
+	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;
+
+	assert(!libsimple_reallocarray(NULL, SIZE_MAX, SIZE_MAX) && errno == ENOMEM);
+
+#if defined(__GNUC__) && !defined(__clang)
+# pragma GCC diagnostic pop
+#endif
+
 	return 0;
 }