tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid out-of-bounds string character access during completion

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-07-06 00:50:15 -04:00
parent 87060b2d3e
commit 9c8f7854ad
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lammps-gui/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.16)
project(lammps-gui VERSION 1.5.11 LANGUAGES CXX)
project(lammps-gui VERSION 1.5.12 LANGUAGES CXX)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)

13
tools/lammps-gui/codeeditor.cpp
View File

@ -582,7 +582,9 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
if (line[begin].isSpace()) break;
--begin;
}
if (((cursor.positionInBlock() - begin) > 2) || (line[begin + 1] == '$')) runCompletion();
if (((cursor.positionInBlock() - begin) > 2) ||
((line.length() > begin + 1) && (line[begin + 1] == '$')))
runCompletion();
if (current_comp && current_comp->popup()->isVisible() &&
((cursor.positionInBlock() - begin) < 2)) {
current_comp->popup()->hide();
@ -620,7 +622,7 @@ void CodeEditor::dropEvent(QDropEvent *event)
if (event->mimeData()->hasUrls()) {
event->accept();
auto file = event->mimeData()->urls()[0].toLocalFile();
auto *gui = dynamic_cast<LammpsGui *>(parent());
auto *gui = dynamic_cast<LammpsGui *>(parent());
if (gui) {
moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
gui->open_file(file);
@ -1093,11 +1095,12 @@ void CodeEditor::insertCompletedCommand(const QString &completion)
// special characters as part of a word.
auto cursor = textCursor();
auto line = cursor.block().text();
int begin = cursor.positionInBlock();
do {
int begin = qMin(cursor.positionInBlock(), line.length() - 1);
while (begin >= 0) {
if (line[begin].isSpace()) break;
--begin;
} while (begin >= 0);
}
int end = begin + 1;
while (end < line.length()) {