1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when QUrl::from{NS/CF}URL() was passed a nullptr

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2017-03-24 13:01:41 +01:00
parent 52767b8ee7
commit e0e717d06a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qcore_foundation.mm
View File

@ -328,6 +328,8 @@ NSUUID *QUuid::toNSUUID() const
*/ */
QUrl QUrl::fromCFURL(CFURLRef url) QUrl QUrl::fromCFURL(CFURLRef url)
{ {
if (!url)
return QUrl();
return QUrl(QString::fromCFString(CFURLGetString(url))); return QUrl(QString::fromCFString(CFURLGetString(url)));
} }
@ -355,6 +357,8 @@ CFURLRef QUrl::toCFURL() const
*/ */
QUrl QUrl::fromNSURL(const NSURL *url) QUrl QUrl::fromNSURL(const NSURL *url)
{ {
if (!url)
return QUrl();
return QUrl(QString::fromNSString([url absoluteString])); return QUrl(QString::fromNSString([url absoluteString]));
} }