Modify malloc_vsnprintf() validation code.

Modify malloc_vsnprintf() validation code to verify that output is
identical to vsnprintf() output, even if both outputs are truncated due
to buffer exhaustion.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/util.c b/src/util.c
index 7d658aa..47e7b66 100644
--- a/src/util.c
+++ b/src/util.c
@@ -433,7 +433,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 	ret = i;
 
 	if (config_debug) {
-		char buf[ret + 2];
+		char buf[MALLOC_PRINTF_BUFSIZE];
 		int tret;
 
 		/*
@@ -442,7 +442,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 		 */
 		tret = vsnprintf(buf, sizeof(buf), format, tap);
 		assert(tret == ret);
-		assert(memcmp(str, buf, ret + 1) == 0);
+		assert(strcmp(buf, str) == 0);
 	}
 
 #undef APPEND_C
@@ -469,8 +469,7 @@ malloc_snprintf(char *str, size_t size, const char *format, ...)
 const char *
 malloc_vtprintf(const char *format, va_list ap)
 {
-	/* buf must be large enough for all possible uses within jemalloc. */
-	static __thread char buf[4096];
+	static __thread char buf[MALLOC_PRINTF_BUFSIZE];
 
 	malloc_vsnprintf(buf, sizeof(buf), format, ap);