More fool-proof lock in thread events code.

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9582bca6d9ef09033f3d35ed93ae123acc4711ec..280e105f2539c09d15fb2b75b1bf7c9ba53e5990 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -200,7 +200,12 @@ extern int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len,
 
     return iLen;
 #else // ANSI
-    return wxVsnprintfA(buf, len, format, argptr);
+    // vsnprintf() will not terminate the string with '\0' if there is not
+    // enough place, but we want the string to always be NUL terminated
+    int rc = wxVsnprintfA(buf, len - 1, format, argptr);
+    buf[len] = 0;
+
+    return rc;
 #endif // Unicode/ANSI
 }