aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2018-10-11 10:48:19 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2018-11-16 09:47:15 +0000
commitf92c48a231d5f98513e649340652baaf01f327ad (patch)
treea6011016996842e6eca514b1ad4c9331af8d8f76 /src
parent7eaa93680ce583354f23f3b29bd6db59169dfece (diff)
JS: Check array subscripts for validity when generating code
Task-number: QTBUG-71079 Change-Id: I999130f3994f513bb9d2ca8ddaa94688451937fc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit b8f4005f132c26b842387e1ae5f492594dc03d86) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qml/compiler/qv4codegen.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index e831fd48f5..7307ee3bd8 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -679,6 +679,8 @@ bool Codegen::visit(ArrayMemberExpression *ast)
return false;
}
Reference index = expression(ast->expression);
+ if (hasError)
+ return false;
_expr.setResult(Reference::fromSubscript(base, index));
return false;
}