Huge streams checking and warning fixes.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index aa150ea4afca0dbf7c5455cc5161142721e50904..c95d6729e8859d4726c3c18b1ad84ed9c600c91b 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -43,6 +43,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifndef __WXMSW__
+#include <errno.h>
+#endif
+
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
@@ -1835,7 +1839,14 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
         // buffer were large enough
-        if ( len >= 0 && len <= size )
+        // also, it may return an errno may be something like EILSEQ,
+        // in which case we need to break out
+        if ( (len >= 0 && len <= size)
+        // No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS
+#if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS )
+            || errno != EOVERFLOW
+#endif
+            )
         {
             // ok, there was enough space
             break;