From d82fb129145f933659f0315ca6203ab51c24937a Mon Sep 17 00:00:00 2001
From: Viktor Engelmann <viktor.engelmann@qt.io>
Date: Thu, 6 Oct 2016 16:08:30 +0200
Subject: Fix nullpointer dereferencing error

Check whether iconUrls is NULL before calling contains(iconUrl) on it,
which, under certain circumstances, caused a SEGFAULT.

Task-number: QTBUG-56330
Change-Id: Ia167d68a4c4d62af4740a8cbab2686bfbc975455
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/webengine/api/qquickwebenginefaviconprovider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webengine/api/qquickwebenginefaviconprovider.cpp b/src/webengine/api/qquickwebenginefaviconprovider.cpp
index fe8436d6c..b5ad6960a 100644
--- a/src/webengine/api/qquickwebenginefaviconprovider.cpp
+++ b/src/webengine/api/qquickwebenginefaviconprovider.cpp
@@ -152,7 +152,7 @@ QQuickWebEngineView *QQuickWebEngineFaviconProvider::viewForIconUrl(const QUrl &
     // latest WebEngineView which was raised an iconChanged signal.
     if (m_latestView) {
         QList<QUrl> *iconUrls = m_iconUrlMap[m_latestView];
-        if (iconUrls->contains(iconUrl))
+        if (iconUrls && iconUrls->contains(iconUrl))
             return m_latestView;
     }
 
-- 
cgit v1.2.3