X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d545bdede67c1f4335e6b4822dfcad3775f631fc..b7c746d017c42dfc5c44adff78b57b18aee90fbc:/src/common/stringimpl.cpp diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp index 95d6863301..4c30917521 100644 --- a/src/common/stringimpl.cpp +++ b/src/common/stringimpl.cpp @@ -42,10 +42,6 @@ #include #include -#ifdef __SALFORDC__ - #include -#endif - // allocating extra space for each string consumes more memory but speeds up // the concatenation operations (nLen is the current string's length) // NB: EXTRA_ALLOC must be >= 0! @@ -584,7 +580,7 @@ wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen, wxASSERT_MSG( nStart <= lenOld, _T("index out of bounds in wxStringImpl::replace") ); size_t nEnd = nStart + nLen; - if ( nEnd > lenOld ) + if ( nLen > lenOld - nStart ) { // nLen may be out of range, as it can be npos, just clump it down nLen = lenOld - nStart;