1 files changed, 12 insertions, 6 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index 0243452e77..ce7fcbb429 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -136,24 +136,30 @@ std::string strip_filename_unsafe_chars(const std::string &s)
     return replace_all_of(s, " .&`\"\'|;{}()[]<>*%$#@!~?", "");
 }
 
-std::string make_stringf(const char *s, ...)
+std::string vmake_stringf(const char* s, va_list args)
 {
-    va_list args;
-    va_start(args, s);
     char buf1[400];
     size_t len = vsnprintf(buf1, sizeof buf1, s, args);
-    va_end(args);
     if (len < sizeof buf1)
         return (buf1);
+
     char *buf2 = (char*)malloc(len + 1);
-    va_start(args, s);
     vsnprintf(buf2, len + 1, s, args);
     std::string ret(buf2);
     free(buf2);
-    va_end(args);
+
     return (ret);
 }
 
+std::string make_stringf(const char *s, ...)
+{
+    va_list args;
+    va_start(args, s);
+    std::string ret = vmake_stringf(s, args);
+    va_end(args);
+    return ret;
+}
+
 std::string &escape_path_spaces(std::string &s)
 {
     std::string result;