From 98277a1e8f7bc7a32035e9ade9a55a4f51d8dd80 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Thu, 7 May 2020 09:29:12 +0200
Subject: qv4compilercontext: avoid potential null deference

Coverity-Id: 274162
Pick-to: 5.15
Change-Id: I58e23d600e9778f5149258fac58657c1a165e0c0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/qml/compiler/qv4compilercontext.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qml/compiler/qv4compilercontext.cpp b/src/qml/compiler/qv4compilercontext.cpp
index 872fc94dc9..08fb2ee993 100644
--- a/src/qml/compiler/qv4compilercontext.cpp
+++ b/src/qml/compiler/qv4compilercontext.cpp
@@ -174,7 +174,10 @@ Context::ResolvedName Context::resolveName(const QString &name, const QQmlJS::So
         c = c->parent;
     }
 
-    if (c && c->contextType == ContextType::ESModule) {
+    if (!c)
+        return result;
+
+    if (c->contextType == ContextType::ESModule) {
         for (int i = 0; i < c->importEntries.count(); ++i) {
             if (c->importEntries.at(i).localName == name) {
                 result.index = i;
-- 
cgit v1.2.3