Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug when appending string to itself (closes bug 1942116) [backport of r48302 from trunk]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-14 16:05:50 +00:00
parent 87be8ad315
commit 77a0f3d154
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -844,6 +844,16 @@ bool wxStringBase::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData,
size_t nLen = pData->nDataLength; size_t nLen = pData->nDataLength;
size_t nNewLen = nLen + nSrcLen; size_t nNewLen = nLen + nSrcLen;
// take special care when appending part of this string to itself: the code
// below reallocates our buffer and this invalidates pszSrcData pointer so
// we have to copy it in another temporary string in this case (but avoid
// doing this unnecessarily)
if ( pszSrcData >= m_pchData && pszSrcData < m_pchData + nLen )
{
wxStringBase tmp(pszSrcData, nSrcLen);
return ConcatSelf(nSrcLen, tmp.m_pchData, nSrcLen);
}
// alloc new buffer if current is too small // alloc new buffer if current is too small
if ( pData->IsShared() ) { if ( pData->IsShared() ) {
STATISTICS_ADD(ConcatHit, 0); STATISTICS_ADD(ConcatHit, 0);