Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix assertion failures on str operations

Browse source
This commit is contained in:
pryon 2024-09-21 20:02:58 +02:00
parent 2a13fca737
commit 173ca3e58e
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/client/cl_uimaprunner.cpp
View file

@ -83,7 +83,7 @@ void PickFile(const char *name, Listener *obj, Event& event)
if (name && *name && strchr(name, '/')) {
currentpath = name;
for (i = currentpath.length(); i > 0; i--) {
for (i = currentpath.length() - 1; i > 0; i--) {
if (currentpath[i] == '/') {
break;
}

28
code/uilib/uimledit.cpp
View file

@ -646,12 +646,19 @@ void UIMultiLineEdit::DeleteSelection(void)
for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < topsel->line; i++, m_lines.IterateNext()) {}
// delete topmost line of the selection, but only up to topsel->column
str& topline = m_lines.getCurrent();
topline.CapLength(topsel->column);
if (topline.length() > topsel->column) {
topline.CapLength(topsel->column);
}
m_lines.IterateNext();
str& line = m_lines.getCurrent();
str line = m_lines.getCurrent();
// merge remainder of topmost line with the remainder after the end of selection
if (line.length() > botsel->column) {
topline += &line[botsel->column];
}
topline += &line[botsel->column];
m_lines.RemoveCurrentSetPrev();
*botsel = *topsel;
m_vertscroll->setNumItems(m_lines.getCount());
@ -691,8 +698,11 @@ void UIMultiLineEdit::CharEvent(int ch)
m_changed = true;
str& line = LineFromLineNumber(m_selection.begin.line, false);
str otherline = &line[m_selection.begin.column];
otherline.CapLength(m_selection.begin.column);
str otherline = "";
if (line.length() > m_selection.begin.column) {
otherline = &line[m_selection.begin.column];
line.CapLength(m_selection.begin.column);
}
if (m_lines.IsCurrentValid()) {
m_lines.InsertAfterCurrent(otherline);
@ -730,7 +740,9 @@ void UIMultiLineEdit::CopySelection(void)
line = LineFromLineNumber(topsel->line, true);
clipText += &line[topsel->column];
if (line.length() > topsel->column) {
clipText += &line[topsel->column];
}
if (topsel->line == botsel->line) {
clipText.CapLength(botsel->column - topsel->column);
@ -740,7 +752,9 @@ void UIMultiLineEdit::CopySelection(void)
}
line = LineFromLineNumber(botsel->line, true);
line.CapLength(botsel->column);
if (line.length() > botsel->column) {
line.CapLength(botsel->column);
}
clipText += "\n" + line;
}