test for timegm() added

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9582bca6d9ef09033f3d35ed93ae123acc4711ec..fe8480cd452c4676141eb87c8521424e19ae92b1 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -200,7 +200,15 @@ 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);
+    if ( rc == -1 )
+    {
+        buf[len] = 0;
+    }
+
+    return rc;
 #endif // Unicode/ANSI
 }