aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljstypedescriptionreader.cpp
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-04-03 18:25:35 +0200
committerRobert Loehning <robert.loehning@qt.io>2017-04-04 08:57:51 +0000
commita49df50443f1fa621bcd6f4fe6f3102a2f147846 (patch)
treec7ccabe7a7b439c5fb5ff3eab3243554fed346a4 /src/libs/qmljs/qmljstypedescriptionreader.cpp
parent16b323500356c084f2c99d3803381dc6354ad4c8 (diff)
qmljs: Prevent possible nullptr access
Change-Id: Ice4a2dd102ed4afda351dc7d011752120d3952b5 Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Christian Kamm <mail@ckamm.de>
Diffstat (limited to 'src/libs/qmljs/qmljstypedescriptionreader.cpp')
-rw-r--r--src/libs/qmljs/qmljstypedescriptionreader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp
index 4a7f30afc4..8c90b416d7 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.cpp
+++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp
@@ -641,7 +641,9 @@ void TypeDescriptionReader::readMetaObjectRevisions(UiScriptBinding *ast, FakeMe
void TypeDescriptionReader::readEnumValues(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaEnum *fme)
{
- if (!ast || !ast->statement) {
+ if (!ast)
+ return;
+ if (!ast->statement) {
addError(ast->colonToken, tr("Expected object literal after colon."));
return;
}