X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f06a017120fd765296f7e8cde414edea64153a9..dd16fdaeaaa5882bdf1ee7af8b2a64821c0680af:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 559bf3311f..cd934faa9e 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -113,7 +113,7 @@ extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
 //       function wxVsnprintfA (A for ANSI), should also find one for Unicode
 //       strings in Unicode build
 #ifdef __WXMSW__
-    #if (defined(__VISUALC__) || defined(wxUSE_NORLANDER_HEADERS)) && !defined(__MINGW32__)
+    #if defined(__VISUALC__) || wxUSE_NORLANDER_HEADERS
         #define wxVsnprintfA     _vsnprintf
     #endif
 #else   // !Windows
@@ -290,11 +290,11 @@ void wxString::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
 {
   Init();
 
-  wxASSERT( nPos <= wxStrlen(psz) );
-
   if ( nLength == wxSTRING_MAXLEN )
     nLength = wxStrlen(psz + nPos);
 
+  wxASSERT_MSG( nPos + nLength <= wxStrlen(psz), _T("index out of bounds") );
+
   STATISTICS_ADD(InitialLength, nLength);
 
   if ( nLength > 0 ) {