From e0e717d06a9da75474c6550e163d0d2ca18c258a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 24 Mar 2017 13:01:41 +0100
Subject: [PATCH] Fix crash when QUrl::from{NS/CF}URL() was passed a nullptr

Change-Id: Ib193447c4a91dd3d08746e97727f7d4764f33d80
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qcore_foundation.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm
index 0e69f69a85a..56eabc4b8c8 100644
--- a/src/corelib/kernel/qcore_foundation.mm
+++ b/src/corelib/kernel/qcore_foundation.mm
@@ -328,6 +328,8 @@ NSUUID *QUuid::toNSUUID() const
 */
 QUrl QUrl::fromCFURL(CFURLRef url)
 {
+    if (!url)
+        return QUrl();
     return QUrl(QString::fromCFString(CFURLGetString(url)));
 }
 
@@ -355,6 +357,8 @@ CFURLRef QUrl::toCFURL() const
 */
 QUrl QUrl::fromNSURL(const NSURL *url)
 {
+    if (!url)
+        return QUrl();
     return QUrl(QString::fromNSString([url absoluteString]));
 }