Fix a test failure in base62 and an out-of-bounds buffer access in th…

…e test

Signed-off-by: Haru <[email protected]>

src/common/base62.c

@@ -25,6 +25,8 @@
 #include "common/nullpo.h"
 #include "common/utils.h"
 
+#include <string.h>
+
 static struct base62_interface base62_s;
 struct base62_interface *base62;
 
@@ -57,12 +59,13 @@ static char base62tbl[62] = {
 static bool base62_encode_int_padded(int value, char *buf, int min_len, int buf_len)
 {
 	nullpo_retr(false, buf);
+
+	// if caller ignores an error, at least it gets a NULL-terminated string
+	memset(buf, '\0', buf_len);
+
 	Assert_retr(false, min_len < buf_len);
 	Assert_retr(false, buf_len >= 2);
 
-	// if caller ignores an error, at least it gets a NULL-terminated string
-	buf[0] = '\0';
-
 	char temp_buf[BASE62_INT_BUFFER_LEN] = { 0 };
 	int max_idx = cap_value(buf_len - 2, 0, BASE62_INT_BUFFER_LEN - 2);
 
@@ -76,7 +79,7 @@ static bool base62_encode_int_padded(int value, char *buf, int min_len, int buf_
 	Assert_retr(false, (value == 0));
 
 	int final_buf_idx = 0;
-	
+
 	if (idx < min_len) {
 		int pad_size = min_len - idx;
 		for (int i = 0; i < pad_size; ++i) {

src/test/test_base62.c

@@ -59,9 +59,9 @@
 } while (false)
 
 #define expect_int(message, actual, expected, ...) \
-	expect("%d", (actual == expected), message, actual, expected, ##__VA_ARGS__)
+	expect("%d", ((actual) == (expected)), message, (actual), (expected), ##__VA_ARGS__)
 #define expect_str(message, actual, expected, ...) \
-	expect("%s", (strcmp(actual, expected) == 0), message, actual, expected, ##__VA_ARGS__)
+	expect("%s", (strcmp((actual), (expected)) == 0), message, (actual), (expected), ##__VA_ARGS__)
 
 static bool test_base62_encode_int_padded(void)
 {
@@ -100,7 +100,7 @@ static bool test_base62_encode_int_padded(void)
 		// This will show an assert error to alert server owners that the used buffer is too small
 		bool res = base62->encode_int_padded(INT_MAX - 1, output, 5, sizeof(output));
 		expect_int("To fail the encoding", res, false);
-		expect_int("To have a NULL-terminated buffer", output[6], '\0');
+		expect_int("To have a NULL-terminated buffer", output[5], '\0');
 	}
 
 	return passed;