Wrong class used in _setCallbackInfo

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index b626fd228f211a670099149cb8a3f3c83c98c929..be458021692ad9fb693bb132431d72e5038786d9 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1839,19 +1839,22 @@ 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
         // 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

-        //
-        // and it may also set errno to EOVERFLOW apparently (which system does
-        // this?)
-        if ( (len >= 0 && len <= size)
-#ifdef EOVERFLOW
-                && errno != EOVERFLOW
-#endif
-            )
+        if ( len >= 0 && len <= size )

         {
             // ok, there was enough space
             break;
         }
 
         {
             // ok, there was enough space
             break;
         }
 

+#ifdef EOVERFLOW
+        // if the error is not due to not having enough space (it could be e.g.
+        // EILSEQ), break too -- we'd just eat all available memory uselessly
+        if ( errno != EOVERFLOW )
+        {
+            // no sense in continuing
+            break;
+        }
+#endif // EOVERFLOW
+

         // still not enough, double it again
         size *= 2;
     }
         // still not enough, double it again
         size *= 2;
     }