aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/generichighlighter
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2017-03-08 10:18:34 +0100
committerDavid Schulz <david.schulz@qt.io>2017-03-08 09:54:00 +0000
commit10c73bac51775d70ec2a09ea833c352254e5517c (patch)
treeeda734c9a7f2feebb69e0c29fe0cc2b2dd18f543 /src/plugins/texteditor/generichighlighter
parent4f91cb3d0cdf9f72f0ce6b1a3bce89f5c7bdb5ea (diff)
Editor: Fix crash in generic Highlighter for invalid rules
Change-Id: I3da9115ecd54f72256e4ee399b2cd37e31f6bcbe Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/texteditor/generichighlighter')
-rw-r--r--src/plugins/texteditor/generichighlighter/specificrules.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp
index c24a4391eb..02e5ed4230 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.cpp
+++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp
@@ -265,6 +265,9 @@ bool KeywordRule::doMatchSucceed(const QString &text,
const int length,
ProgressData *progress)
{
+ if (m_list.isNull()) // Happens if a keyword rule points to a none existing keyword list
+ return false;
+
int current = progress->offset();
if (current > 0 && !definition()->isDelimiter(text.at(current - 1)))