bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed string subscript out of range bug in editors undo stack.

Browse Source
This commit is contained in:
Ianos Gnatiuc
2006-06-25 07:45:12 +00:00
parent dd8361bf25
commit b5719339a2
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
golded3/geedit.cpp
View File

@@ -1063,26 +1063,27 @@ Line* IEclass::wrapit(Line** __currline, uint* __curr_col, uint* __curr_row, boo
}
}
// Was this line truncated at space?
bool truncated_at_space = make_bool(isspace(_thisline->txt[_wrappos]));
// Truncate at the wrapping location
_thisline->txt.erase(_wrappos);
// Was this line quoted?
if(_quotelen) {
if (_quotelen)
{
// Trim spaces off the end of the line
int _trimpos = _wrappos - 1;
if(isspace(_thisline->txt[_trimpos])) {
while(_trimpos > 0 and isspace(_thisline->txt[_trimpos-1]))
if (isspace(_thisline->txt[_trimpos]))
{
while (_trimpos > 0 and isspace(_thisline->txt[_trimpos-1]))
_trimpos--;
if(_quotelen and (_trimpos < _quotelen))
_trimpos++;
Undo->PushItem(EDIT_UNDO_OVR_CHAR|BATCH_MODE, _thisline, _trimpos);
_thisline->txt.erase(_trimpos);
}
Undo->PushItem((truncated_at_space?EDIT_UNDO_OVR_CHAR:EDIT_UNDO_INS_CHAR)|BATCH_MODE, _thisline, _trimpos+1);
else
{
Undo->PushItem(EDIT_UNDO_INS_CHAR|BATCH_MODE, _thisline, _trimpos + 1);
}
// Append a new linefeed
_thisline->txt += "\n";