Applied patch [ 1192917 ] Grids with no row or col headers cause AV under wxGTK

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index efc76beea912f3138dfa4a5cac515d2f44810c8d..be458021692ad9fb693bb132431d72e5038786d9 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1839,25 +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
-        // 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 nor MacOS (not X)
-        // not OS/2 (not Innotek libc).
-#if !defined(__WXMSW__)                              && \
-    !defined(__WXPALMOS__)                           && \
-    !defined(__OpenBSD__)                            && \
-    !defined( __VMS )                                && \
-    !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && \
-    !(defined(__EMX__) && !defined(__INNOTEK_LIBC__))
-            || errno != EOVERFLOW
-#endif
-            )
+        if ( len >= 0 && len <= size )
         {
             // 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;
     }