Merge pull request CleverRaven#6547 from BevapDin/fix-string-format

Fix the "invalid input to string_format function!" message

src/output.cpp

@@ -1207,16 +1207,15 @@ std::string from_sentence_case (const std::string &kingston)
 
 std::string vstring_format(const char *pattern, va_list argptr)
 {
-    int buffer_size = 1024; // Any number is good
+    int buffer_size = 10240; // Any number is good
     int returned_length = 0;
     std::vector<char> buffer(buffer_size, '\0');
     // Call of vsnprintf() makes va_list unusable, so we need a copy.
     va_list cur_argptr;
-#ifdef _MSC_VER
+#if (defined(_WIN32) || defined(WINDOWS) || defined(__WIN32__))
     // Microsofts vsnprintf does return -1 on buffer overflow, not
     // the required size of the buffer. So we have to increase the buffer
     // until we succeed.
-    buffer_size = 1024;
     while(true) {
         buffer.resize(buffer_size, '\0');
         va_copy(cur_argptr, argptr);
@@ -1232,7 +1231,6 @@ std::string vstring_format(const char *pattern, va_list argptr)
     const int required = vsnprintf(&buffer[0], buffer_size, pattern, cur_argptr);
     va_end(cur_argptr);
     if (required < 0) {
-        debugmsg("invalid input to string_format function!");
         return std::string("invalid input to string_format function!");
     } else if (required >= buffer_size) {
         // Did not fit the buffer, retry with better buffer size.