Check returned Bundle ID for NULL

glassez · glassez · commit c20653909c25 · 2023-08-14T15:49:19.000+03:00
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
@@ -1411,7 +1411,8 @@ bool Preferences::isTorrentFileAssocSet()
         if (defaultHandlerId != NULL)
         {
             const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
-            isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
+            if (myBundleId != NULL)
+                isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
             CFRelease(defaultHandlerId);
         }
         CFRelease(torrentId);
@@ -1423,11 +1424,13 @@ void Preferences::setTorrentFileAssoc()
 {
     if (isTorrentFileAssocSet())
         return;
+
     const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
     if (torrentId != NULL)
     {
         const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
-        LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);
+        if (myBundleId != NULL)
+            LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);
         CFRelease(torrentId);
     }
 }
@@ -1439,7 +1442,8 @@ bool Preferences::isMagnetLinkAssocSet()
     if (defaultHandlerId != NULL)
     {
         const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
-        isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
+        if (myBundleId != NULL)
+            isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
         CFRelease(defaultHandlerId);
     }
     return isSet;
@@ -1449,8 +1453,10 @@ void Preferences::setMagnetLinkAssoc()
 {
     if (isMagnetLinkAssocSet())
         return;
+
     const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
-    LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);
+    if (myBundleId != NULL)
+        LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);
 }
 #endif // Q_OS_MACOS
 

Original file line number	Diff line number	Diff line change
`@@ -1411,7 +1411,8 @@ bool Preferences::isTorrentFileAssocSet()`
`1411`	`1411`	`if (defaultHandlerId != NULL)`
`1412`	`1412`	`{`
`1413`	`1413`	`const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());`
`1414`		`- isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;`
	`1414`	`+ if (myBundleId != NULL)`
	`1415`	`+ isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;`
`1415`	`1416`	`CFRelease(defaultHandlerId);`
`1416`	`1417`	`}`
`1417`	`1418`	`CFRelease(torrentId);`
`@@ -1423,11 +1424,13 @@ void Preferences::setTorrentFileAssoc()`
`1423`	`1424`	`{`
`1424`	`1425`	`if (isTorrentFileAssocSet())`
`1425`	`1426`	`return;`
	`1427`	`+`
`1426`	`1428`	`const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);`
`1427`	`1429`	`if (torrentId != NULL)`
`1428`	`1430`	`{`
`1429`	`1431`	`const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());`
`1430`		`- LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);`
	`1432`	`+ if (myBundleId != NULL)`
	`1433`	`+ LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);`
`1431`	`1434`	`CFRelease(torrentId);`
`1432`	`1435`	`}`
`1433`	`1436`	`}`
`@@ -1439,7 +1442,8 @@ bool Preferences::isMagnetLinkAssocSet()`
`1439`	`1442`	`if (defaultHandlerId != NULL)`
`1440`	`1443`	`{`
`1441`	`1444`	`const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());`
`1442`		`- isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;`
	`1445`	`+ if (myBundleId != NULL)`
	`1446`	`+ isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;`
`1443`	`1447`	`CFRelease(defaultHandlerId);`
`1444`	`1448`	`}`
`1445`	`1449`	`return isSet;`
`@@ -1449,8 +1453,10 @@ void Preferences::setMagnetLinkAssoc()`
`1449`	`1453`	`{`
`1450`	`1454`	`if (isMagnetLinkAssocSet())`
`1451`	`1455`	`return;`
	`1456`	`+`
`1452`	`1457`	`const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());`
`1453`		`- LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);`
	`1458`	`+ if (myBundleId != NULL)`
	`1459`	`+ LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);`
`1454`	`1460`	`}`
`1455`	`1461`	`#endif // Q_OS_MACOS`
`1456`	`1462`