diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-03-24 13:01:41 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-03-27 17:39:58 +0000 |
| commit | e0e717d06a9da75474c6550e163d0d2ca18c258a (patch) | |
| tree | 4e2043a8d936114fffca403bde7ed59ca3efa05f | |
| parent | 52767b8ee754f97abe42e9cdc3bcf69365a401fe (diff) | |
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>
| -rw-r--r-- | src/corelib/kernel/qcore_foundation.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm index 0e69f69a85..56eabc4b8c 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])); } |