Merge branch 'Crash-on-match-parentheses' into '0.13.1-rc'

Protect from bad string access See merge request devel/studio!384
GAMS-dev · Oct 30, 2019 · d8c3e48 · d8c3e48
2 parents 59ad80d + 1728c84
commit d8c3e48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/search/searchdialog.cpp b/src/search/searchdialog.cpp
@@ -814,6 +814,7 @@ void SearchDialog::autofillSearchField()
     }
 
     ui->combo_search->setFocus();
+    ui->combo_search->lineEdit()->selectAll();
 }
 
 void SearchDialog::updateNrMatches(int current, int max)

diff --git a/src/syntax/syntaxhighlighter.cpp b/src/syntax/syntaxhighlighter.cpp
@@ -306,6 +306,7 @@ void SyntaxHighlighter::scanParentheses(const QString &text, int start, int len,
     }
     if (invalidParenthesesSyntax.contains(kind)) return;
     for (int i = start; i < start+len; ++i) {
+        if (i >= text.length()) break;
         int iPara = validParentheses.indexOf(text.at(i));
         if (iPara == 6) {
             if (kind == SyntaxKind::IdentifierAssignmentEnd) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -814,6 +814,7 @@ void SearchDialog::autofillSearchField() @@
         }
         ui->combo_search->setFocus();
+        ui->combo_search->lineEdit()->selectAll();
     }
     void SearchDialog::updateNrMatches(int current, int max)
@@ Expand Down @@