From 777556306a5ab23d97d955701c93ae764673ddfe Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 5 Nov 2024 11:32:17 +0100 Subject: make string format RAII --- src/crepe/util/fmt.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp index 8ef1164..397bf9f 100644 --- a/src/crepe/util/fmt.cpp +++ b/src/crepe/util/fmt.cpp @@ -7,17 +7,19 @@ using namespace std; string crepe::util::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); -- cgit v1.2.3