From a49df50443f1fa621bcd6f4fe6f3102a2f147846 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Mon, 3 Apr 2017 18:25:35 +0200
Subject: [PATCH] qmljs: Prevent possible nullptr access
Change-Id: Ice4a2dd102ed4afda351dc7d011752120d3952b5
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Christian Kamm <mail@ckamm.de>
---
src/libs/qmljs/qmljstypedescriptionreader.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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;
}
--
GitLab