Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I5d2c3da38df35922b2147c3c0bc55c6c3bae2fe5

2 files changed, 12 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index a0b11c2c51..e10bf3cf79 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -173,7 +173,7 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
         bool ok = false;
         maxCallDepth = qEnvironmentVariableIntValue("QV4_MAX_CALL_DEPTH", &ok);
         if (!ok || maxCallDepth <= 0) {
-#if defined(QT_NO_DEBUG) && !defined(__SANITIZE_ADDRESS__)
+#if defined(QT_NO_DEBUG) && !defined(__SANITIZE_ADDRESS__) && !QT_HAS_FEATURE(address_sanitizer)
             maxCallDepth = 1234;
 #else
             // no (tail call) optimization is done, so there'll be a lot mare stack frames active
diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp
index 4e917feb2d..f3351f6da0 100644
--- a/src/qml/jsruntime/qv4qmlcontext.cpp
+++ b/src/qml/jsruntime/qv4qmlcontext.cpp
@@ -457,11 +457,17 @@ ReturnedValue QQmlContextWrapper::resolveQmlContextPropertyLookupGetter(Lookup *
     // into the handler expression through the locals of the call context. So for onClicked: { ... }
     // the parameters of the clicked signal are injected and we must allow for them to be found here
     // before any other property from the QML context.
-    ExecutionContext &ctx = static_cast<ExecutionContext &>(engine->currentStackFrame->jsFrame->context);
-    if (ctx.d()->type == Heap::ExecutionContext::Type_CallContext) {
-        uint index = ctx.d()->internalClass->indexOfValueOrGetter(name);
-        if (index < UINT_MAX)
-            return static_cast<Heap::CallContext*>(ctx.d())->locals[index].asReturnedValue();
+    for (Heap::ExecutionContext *ctx = engine->currentContext()->d(); ctx; ctx = ctx->outer) {
+        if (ctx->type == Heap::ExecutionContext::Type_CallContext) {
+            const uint index = ctx->internalClass->indexOfValueOrGetter(name);
+            if (index < std::numeric_limits<uint>::max())
+                return static_cast<Heap::CallContext *>(ctx)->locals[index].asReturnedValue();
+        }
+
+        // Skip only block contexts within the current call context.
+        // Other contexts need a regular QML property lookup. See below.
+        if (ctx->type != Heap::ExecutionContext::Type_BlockContext)
+            break;
     }
 
     bool hasProperty = false;