aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4compilercontext_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-04-30 12:34:54 +0200
committerLars Knoll <lars.knoll@qt.io>2018-05-02 14:16:59 +0000
commit3f82c8131fed248c24ed8c8be7449b4732afcd0b (patch)
treedb9d38747763beafb5cacb8a848cf9989e241263 /src/qml/compiler/qv4compilercontext_p.h
parent6d0378ad9b91db04ca725b98d941d32871b19d82 (diff)
Fix crashes when parsing functions with no parameters
Commit da5fffbd34d8be68f8ee4c649881dbb673c9c0a5 introduced deferencing of the formals parameter list that can be a null pointer if the declared function has no parameters. Change-Id: Id7dce0f78b16266e672f0ae430ee4f979de5734d Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compilercontext_p.h')
-rw-r--r--src/qml/compiler/qv4compilercontext_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h
index e53fb26e4a..2479465587 100644
--- a/src/qml/compiler/qv4compilercontext_p.h
+++ b/src/qml/compiler/qv4compilercontext_p.h
@@ -265,7 +265,7 @@ struct Context {
return true;
if (type != FunctionDefinition) {
- if (formals->containsName(name))
+ if (formals && formals->containsName(name))
return (scope == QQmlJS::AST::VariableScope::Var);
}
MemberMap::iterator it = members.find(name);