merge `master` into `loek/savemgr`loek/savemgr

1 files changed, 11 insertions, 9 deletions

diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
index 8ef1164..4b50da8 100644
--- a/src/crepe/util/fmt.cpp
+++ b/src/crepe/util/fmt.cpp
@@ -6,25 +6,27 @@
 
 using namespace std;
 
-string crepe::util::va_stringf(va_list args, const char * fmt) {
+string crepe::va_stringf(va_list args, const char * fmt) {
+	string out;
+
 	va_list args_copy;
 	va_copy(args_copy, args);
-
-	size_t sz = vsnprintf(NULL, 0, fmt, args_copy) + 1;
-	char * msg = (char *) malloc(sz);
+	size_t length = vsnprintf(NULL, 0, fmt, args_copy);
+	// resize to include terminating null byte
+	out.resize(length + 1);
 	va_end(args_copy);
 
-	vsnprintf(msg, sz, fmt, args);
-
-	string out = msg;
-	free(msg);
+	// vsnprintf adds terminating null byte
+	vsnprintf(out.data(), out.size(), fmt, args);
+	// resize to actual length
+	out.resize(length);
 
 	va_end(args);
 
 	return out;
 }
 
-string crepe::util::stringf(const char * fmt, ...) {
+string crepe::stringf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	string out = va_stringf(args, fmt);