Fix macOS launch-at-startup memory issue

jonasschnelli · furszy · commit d6e1383f9002 · 2021-06-24T11:55:19.000-03:00
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -636,10 +636,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
 #elif defined(Q_OS_MAC) && defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED <= 101100
 // based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
 
-LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl);
-LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl)
+LSSharedFileListItemRef findStartupItemInList(CFArrayRef listSnapshot, LSSharedFileListRef list, CFURLRef findUrl)
 {
-    CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(list, nullptr);
     if (listSnapshot == nullptr) {
         return nullptr;
     }
@@ -664,15 +662,12 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef
         if (currentItemURL) {
             if (CFEqual(currentItemURL, findUrl)) {
                 // found
-                CFRelease(listSnapshot);
                 CFRelease(currentItemURL);
                 return item;
             }
             CFRelease(currentItemURL);
         }
     }
-
-    CFRelease(listSnapshot);
     return nullptr;
 }
 
@@ -684,10 +679,12 @@ bool GetStartOnSystemStartup()
     }
 
     LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);
-    LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);
-
+    CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(loginItems, nullptr);
+    bool res = (findStartupItemInList(listSnapshot, loginItems, bitcoinAppUrl) != nullptr);
     CFRelease(bitcoinAppUrl);
-    return !!foundItem; // return boolified object
+    CFRelease(loginItems);
+    CFRelease(listSnapshot);
+    return res;
 }
 
 bool SetStartOnSystemStartup(bool fAutoStart)
@@ -698,7 +695,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
     }
 
     LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);
-    LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);
+    CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(loginItems, nullptr);
+    LSSharedFileListItemRef foundItem = findStartupItemInList(listSnapshot, loginItems, bitcoinAppUrl);
 
     if (fAutoStart && !foundItem) {
         // add pivx app to startup item list
@@ -709,6 +707,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
     }
 
     CFRelease(bitcoinAppUrl);
+    CFRelease(loginItems);
+    CFRelease(listSnapshot);
     return true;
 }
 #pragma GCC diagnostic pop

Original file line number	Diff line number	Diff line change
`@@ -636,10 +636,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)`
`636`	`636`	`#elif defined(Q_OS_MAC) && defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED <= 101100`
`637`	`637`	`// based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m`
`638`	`638`
`639`		`-LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl);`
`640`		`-LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl)`
	`639`	`+LSSharedFileListItemRef findStartupItemInList(CFArrayRef listSnapshot, LSSharedFileListRef list, CFURLRef findUrl)`
`641`	`640`	`{`
`642`		`- CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(list, nullptr);`
`643`	`641`	`if (listSnapshot == nullptr) {`
`644`	`642`	`return nullptr;`
`645`	`643`	`}`
`@@ -664,15 +662,12 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef`
`664`	`662`	`if (currentItemURL) {`
`665`	`663`	`if (CFEqual(currentItemURL, findUrl)) {`
`666`	`664`	`// found`
`667`		`- CFRelease(listSnapshot);`
`668`	`665`	`CFRelease(currentItemURL);`
`669`	`666`	`return item;`
`670`	`667`	`}`
`671`	`668`	`CFRelease(currentItemURL);`
`672`	`669`	`}`
`673`	`670`	`}`
`674`		`-`
`675`		`- CFRelease(listSnapshot);`
`676`	`671`	`return nullptr;`
`677`	`672`	`}`
`678`	`673`
`@@ -684,10 +679,12 @@ bool GetStartOnSystemStartup()`
`684`	`679`	`}`
`685`	`680`
`686`	`681`	`LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);`
`687`		`- LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);`
`688`		`-`
	`682`	`+ CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(loginItems, nullptr);`
	`683`	`+ bool res = (findStartupItemInList(listSnapshot, loginItems, bitcoinAppUrl) != nullptr);`
`689`	`684`	`CFRelease(bitcoinAppUrl);`
`690`		`- return !!foundItem; // return boolified object`
	`685`	`+ CFRelease(loginItems);`
	`686`	`+ CFRelease(listSnapshot);`
	`687`	`+ return res;`
`691`	`688`	`}`
`692`	`689`
`693`	`690`	`bool SetStartOnSystemStartup(bool fAutoStart)`
`@@ -698,7 +695,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)`
`698`	`695`	`}`
`699`	`696`
`700`	`697`	`LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);`
`701`		`- LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);`
	`698`	`+ CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(loginItems, nullptr);`
	`699`	`+ LSSharedFileListItemRef foundItem = findStartupItemInList(listSnapshot, loginItems, bitcoinAppUrl);`
`702`	`700`
`703`	`701`	`if (fAutoStart && !foundItem) {`
`704`	`702`	`// add pivx app to startup item list`
`@@ -709,6 +707,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)`
`709`	`707`	`}`
`710`	`708`
`711`	`709`	`CFRelease(bitcoinAppUrl);`
	`710`	`+ CFRelease(loginItems);`
	`711`	`+ CFRelease(listSnapshot);`
`712`	`712`	`return true;`
`713`	`713`	`}`
`714`	`714`	`#pragma GCC diagnostic pop`