diff --git a/src/civetweb.c b/src/civetweb.c
index 7e3e09aa..9a002a9e 100644
--- a/src/civetweb.c
+++ b/src/civetweb.c
@@ -4175,7 +4175,7 @@ static int
 alloc_vprintf2(char **buf, const char *fmt, va_list ap)
 {
 	va_list ap_copy;
-	size_t size = MG_BUF_LEN;
+	size_t size = MG_BUF_LEN / 4;
 	int len = -1;
 
 	*buf = NULL;
@@ -4183,14 +4183,17 @@ alloc_vprintf2(char **buf, const char *fmt, va_list ap)
 		if (*buf) {
 			mg_free(*buf);
 		}
-		*buf = (char *)mg_malloc(size *= 4);
+
+		size *= 4;
+		*buf = (char *)mg_malloc(size);
 		if (!*buf) {
 			break;
 		}
+
 		va_copy(ap_copy, ap);
 		len = vsnprintf_impl(*buf, size - 1, fmt, ap_copy);
 		va_end(ap_copy);
-		*buf[size - 1] = 0;
+		(*buf)[size - 1] = 0;
 	}
 
 	return len;
diff --git a/test/private.c b/test/private.c
index 26b731d7..ed8b9791 100644
--- a/test/private.c
+++ b/test/private.c
@@ -536,10 +536,51 @@ END_TEST
 
 START_TEST(test_parse_date_string)
 {
-	ck_assert_uint_eq((unsigned long)parse_date_string("1/Jan/1970 00:01:02"), 62ul);
-	ck_assert_uint_eq((unsigned long)parse_date_string("1 Jan 1970 00:02:03"), 123ul);
-	ck_assert_uint_eq((unsigned long)parse_date_string("1-Jan-1970 00:03:04"), 184ul);
-	ck_assert_uint_eq((unsigned long)parse_date_string("Xyz, 1 Jan 1970 00:04:05"), 245ul);
+	time_t now = time(0);
+	struct tm *tm = gmtime(&now);
+	char date[64] = {0};
+	unsigned long i;
+
+	ck_assert_uint_eq((unsigned long)parse_date_string("1/Jan/1970 00:01:02"),
+	                  62ul);
+	ck_assert_uint_eq((unsigned long)parse_date_string("1 Jan 1970 00:02:03"),
+	                  123ul);
+	ck_assert_uint_eq((unsigned long)parse_date_string("1-Jan-1970 00:03:04"),
+	                  184ul);
+	ck_assert_uint_eq((unsigned long)parse_date_string(
+	                      "Xyz, 1 Jan 1970 00:04:05"),
+	                  245ul);
+
+	gmt_time_string(date, sizeof(date), &now);
+	ck_assert_uint_eq((uintmax_t)parse_date_string(date), (uintmax_t)now);
+
+	sprintf(date,
+	        "%02u %s %04u %02u:%02u:%02u",
+	        tm->tm_mday,
+	        month_names[tm->tm_mon],
+	        tm->tm_year + 1900,
+	        tm->tm_hour,
+	        tm->tm_min,
+	        tm->tm_sec);
+	ck_assert_uint_eq((uintmax_t)parse_date_string(date), (uintmax_t)now);
+
+	for (i = 2ul; i < 0x8000000ul; i += i / 2) {
+		now = (time_t)i;
+
+		gmt_time_string(date, sizeof(date), &now);
+		ck_assert_uint_eq((uintmax_t)parse_date_string(date), (uintmax_t)now);
+
+		tm = gmtime(&now);
+		sprintf(date,
+		        "%02u-%s-%04u %02u:%02u:%02u",
+		        tm->tm_mday,
+		        month_names[tm->tm_mon],
+		        tm->tm_year + 1900,
+		        tm->tm_hour,
+		        tm->tm_min,
+		        tm->tm_sec);
+		ck_assert_uint_eq((uintmax_t)parse_date_string(date), (uintmax_t)now);
+	}
 }
 END_TEST
 
@@ -590,3 +631,16 @@ make_private_suite(void)
 
 	return suite;
 }
+
+
+#ifdef REPLACE_CHECK_FOR_LOCAL_DEBUGGING
+/* Used to debug test cases without using the check framework */
+
+void
+main(void)
+{
+	test_alloc_vprintf(0);
+	test_parse_date_string(0);
+}
+
+#endif
diff --git a/test/public_server.c b/test/public_server.c
index 681f2c12..f9d62bc8 100644
--- a/test/public_server.c
+++ b/test/public_server.c
@@ -1495,8 +1495,9 @@ make_public_server_suite(void)
 static int chk_ok = 0;
 static int chk_failed = 0;
 
+
 void
-main(void)
+xmain(void)
 {
 	test_the_test_environment(0);
 	test_threading(0);