AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

calling insert("") would provoke an assert - now it's just ignored

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-08-22 20:44:07 +00:00
parent 1880e45211
commit cb6780ff01
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/string.cpp
View File

@ -930,13 +930,15 @@ wxString& wxString::insert(size_t nPos, const wxString& str)
wxASSERT( str.GetStringData()->IsValid() );
wxASSERT( nPos <= Len() );
wxString strTmp;
char *pc = strTmp.GetWriteBuf(Len() + str.Len());
strncpy(pc, c_str(), nPos);
strcpy(pc + nPos, str);
strcpy(pc + nPos + str.Len(), c_str() + nPos);
strTmp.UngetWriteBuf();
*this = strTmp;
if ( !str.IsEmpty() ) {
wxString strTmp;
char *pc = strTmp.GetWriteBuf(Len() + str.Len());
strncpy(pc, c_str(), nPos);
strcpy(pc + nPos, str);
strcpy(pc + nPos + str.Len(), c_str() + nPos);
strTmp.UngetWriteBuf();
*this = strTmp;
}
return *this;
}