applied patch 1683441

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index d608a5773d45eec10457409dcc99433421e2026c..7217296d2f5b11b6e6822c351f3ed07b1fff241b 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -90,16 +90,14 @@ public:
     // we just use casts here because the fields of regmatch_t struct may be 64
     // bit but we're limited to size_t in our public API and are not going to
     // change it because operating on strings longer than 4GB using it is
-    // absolutely impractical anyhow, but still check at least in debug
+    // absolutely impractical anyhow
     size_t Start(size_t n) const
     {
-        wxASSERT_MSG( m_matches[n].rm_so < UINT_MAX, _T("regex offset overflow") );
         return wx_truncate_cast(size_t, m_matches[n].rm_so);
     }
 
     size_t End(size_t n) const
     {
-        wxASSERT_MSG( m_matches[n].rm_eo < UINT_MAX, _T("regex offset overflow") );
         return wx_truncate_cast(size_t, m_matches[n].rm_eo);
     }
 
@@ -251,7 +249,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const
 
         (void)wx_regerror(errorcode, &m_RegEx, szcmbError, len);
 
-        szError = wxConvertMB2WX(szcmbError);
+        szError = wxConvLibc.cMB2WX(szcmbError);
         delete [] szcmbError;
     }
     else // regerror() returned 0