mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Check returned Bundle ID for NULL

Browse source 
PR #19463.
This commit is contained in:
Vladimir Golovnev 2023-08-14 16:01:54 +03:00
parent 062e35e6b0
commit 2b69cabc2c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/base/preferences.cpp
View file

@ -1411,6 +1411,7 @@ bool Preferences::isTorrentFileAssocSet()
if (defaultHandlerId != NULL) if (defaultHandlerId != NULL)
{ {
const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle()); const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
if (myBundleId != NULL)
isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo; isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
CFRelease(defaultHandlerId); CFRelease(defaultHandlerId);
} }
@ -1423,10 +1424,12 @@ void Preferences::setTorrentFileAssoc()
{ {
if (isTorrentFileAssocSet()) if (isTorrentFileAssocSet())
return; return;
const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL); const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
if (torrentId != NULL) if (torrentId != NULL)
{ {
const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle()); const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
if (myBundleId != NULL)
LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId); LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);
CFRelease(torrentId); CFRelease(torrentId);
} }
@ -1439,6 +1442,7 @@ bool Preferences::isMagnetLinkAssocSet()
if (defaultHandlerId != NULL) if (defaultHandlerId != NULL)
{ {
const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle()); const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
if (myBundleId != NULL)
isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo; isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
CFRelease(defaultHandlerId); CFRelease(defaultHandlerId);
} }
@ -1449,7 +1453,9 @@ void Preferences::setMagnetLinkAssoc()
{ {
if (isMagnetLinkAssocSet()) if (isMagnetLinkAssocSet())
return; return;
const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle()); const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
if (myBundleId != NULL)
LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId); LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);
} }
#endif // Q_OS_MACOS #endif // Q_OS_MACOS