kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix crash in ExpressionCompleter::slotUpdate

Browse Source
This commit is contained in:
wmayer
2017-12-06 23:02:00 +01:00
parent f5146508bb
commit 4514d7a7fd
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Gui/ExpressionCompleter.cpp
View File

@@ -254,19 +254,23 @@ void ExpressionCompleter::slotUpdate(const QString & prefix)
}
// Extract last tokens that can be rebuild to a variable
ssize_t i = static_cast<std::size_t>(tokens.size()) - 1;
ssize_t i = static_cast<ssize_t>(tokens.size()) - 1;
while (i >= 0) {
if (get<0>(tokens[i]) != ExpressionParser::IDENTIFIER &&
get<0>(tokens[i]) != ExpressionParser::STRING &&
get<0>(tokens[i]) != ExpressionParser::UNIT &&
get<0>(tokens[i]) != '.')
get<0>(tokens[i]) != ExpressionParser::STRING &&
get<0>(tokens[i]) != ExpressionParser::UNIT &&
get<0>(tokens[i]) != '.')
break;
--i;
}
++i;
// Set prefix start for use when replacing later
prefixStart = (prefix.at(0) == QChar::fromLatin1('=') ? 1 : 0) + get<1>(tokens[i]);
if (i == static_cast<ssize_t>(tokens.size()))
prefixStart = prefix.size();
else
prefixStart = (prefix.at(0) == QChar::fromLatin1('=') ? 1 : 0) + get<1>(tokens[i]);
// Build prefix from tokens
while (i < static_cast<ssize_t>(tokens.size())) {