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

fixed writing to wxUniCharRef after its 'parent' iterator was destroyed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-08-26 13:02:38 +00:00
parent 3d593f49a4
commit 6bd4f2812d
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/unichar.cpp
View File

@@ -106,8 +106,7 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
// code -- in that case, we have to use wxStringImpl::replace() and
// this invalidates all iterators, so we have to update them too:
wxString& str = *wx_const_cast(wxString*, m_node.m_str);
wxStringImpl& strimpl = str.m_impl;
wxStringImpl& strimpl = m_str.m_impl;
int iterDiff = lenNew - lenOld;
size_t posIdx = m_pos - strimpl.begin();
@@ -121,7 +120,7 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
size_t *indexes = indexes_a;
size_t iterNum = 0;
wxStringIteratorNode *it;
for ( it = str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
for ( it = m_str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
{
wxASSERT( it->m_iter || it->m_citer );
@@ -152,7 +151,7 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
// finally, set the iterators to valid values again (note that this
// updates m_pos as well):
size_t i;
for ( i = 0, it = str.m_iterators.ptr; it; it = it->m_next, ++i )
for ( i = 0, it = m_str.m_iterators.ptr; it; it = it->m_next, ++i )
{
wxASSERT( i < iterNum );
wxASSERT( it->m_iter || it->m_citer );