1 files changed, 15 insertions, 17 deletions
diff --git a/OpenAL32/alError.cpp b/OpenAL32/alError.cpp
index a02d09c9..2c2a80eb 100644
--- a/OpenAL32/alError.cpp
+++ b/OpenAL32/alError.cpp
@@ -22,6 +22,7 @@
 
 #include <csignal>
 #include <cstdarg>
+#include <cstdio>
 
 #ifdef HAVE_WINDOWS_H
 #define WIN32_LEAN_AND_MEAN
@@ -36,28 +37,25 @@ ALboolean TrapALError = AL_FALSE;
 
 void alSetError(ALCcontext *context, ALenum errorCode, const char *msg, ...)
 {
-    char message[1024]{};
+    auto message = al::vector<char>(256);
 
-    va_list args;
+    va_list args, args2;
     va_start(args, msg);
-    int msglen{vsnprintf(message, sizeof(message), msg, args)};
-    va_end(args);
-
-    if(msglen < 0 || static_cast<size_t>(msglen) >= sizeof(message))
-    {
-        message[sizeof(message)-1] = 0;
-        msglen = static_cast<int>(strlen(message));
-    }
-    if(msglen > 0)
-        msg = message;
-    else
+    va_copy(args2, args);
+    int msglen{std::vsnprintf(message.data(), message.size(), msg, args)};
+    if(msglen >= 0 && static_cast<size_t>(msglen) >= message.size())
     {
-        msg = "<internal error constructing message>";
-        msglen = static_cast<int>(strlen(msg));
+        message.resize(static_cast<size_t>(msglen) + 1u);
+        msglen = std::vsnprintf(message.data(), message.size(), msg, args2);
     }
+    va_end(args2);
+    va_end(args);
+
+    if(msglen >= 0) msg = message.data();
+    else msg = "<internal error constructing message>";
+    msglen = static_cast<int>(strlen(msg));
 
-    WARN("Error generated on context %p, code 0x%04x, \"%s\"\n",
-         context, errorCode, message);
+    WARN("Error generated on context %p, code 0x%04x, \"%s\"\n", context, errorCode, msg);
     if(TrapALError)
     {
 #ifdef _WIN32