Calling the completion handler in the case of a nil self

seemoo-lab · Apr 29, 2021 · ba17419 · ba17419
1 parent c618aab
commit ba17419
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/Firmware/ESP32/.vscode/settings.json b/Firmware/ESP32/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "idf.port": "/dev/cu.usbserial-0001"
+}
diff --git a/OpenHaystack/OpenHaystack/FindMy/FindMyController.swift b/OpenHaystack/OpenHaystack/FindMy/FindMyController.swift
@@ -33,7 +33,10 @@ class FindMyController: ObservableObject {
 
         // Decrypt the reports with the imported keys
         DispatchQueue.global(qos: .background).async { [weak self] in
-          guard let self = self else { return }
+            guard let self = self else {
+                completion()
+                return
+            }
 
             var d = self.devices
             // Add the reports to the according device by finding the right key for the report
@@ -110,7 +113,10 @@ class FindMyController: ObservableObject {
     func fetchReports(with searchPartyToken: Data, completion: @escaping (Error?) -> Void) {
 
         DispatchQueue.global(qos: .background).async { [weak self] in
-          guard let self = self else { return }
+            guard let self = self else {
+                completion(FindMyErrors.objectReleased)
+                return
+            }
             let fetchReportGroup = DispatchGroup()
 
             let fetcher = ReportsFetcher()
@@ -169,9 +175,13 @@ class FindMyController: ObservableObject {
                 #endif
 
                 DispatchQueue.main.async { [weak self] in
-                    self?.devices = devices
+                    guard let self = self else {
+                        completion(FindMyErrors.objectReleased)
+                        return
+                    }
+                    self.devices = devices
 
-                    self?.decryptReports {
+                    self.decryptReports {
                         completion(nil)
                     }
 
@@ -230,4 +240,5 @@ class FindMyController: ObservableObject {
 
 enum FindMyErrors: Error {
     case decodingPlistFailed(message: String)
+    case objectReleased
 }
diff --git a/OpenHaystack/OpenHaystack/HaystackApp/AccessoryController.swift b/OpenHaystack/OpenHaystack/HaystackApp/AccessoryController.swift
@@ -161,7 +161,10 @@ class AccessoryController: ObservableObject {
     /// - Parameter completion: called when the reports have been succesfully downloaded or the request has failed
     func downloadLocationReports(completion: @escaping (Result<Void, OpenHaystackMainView.AlertType>) -> Void) {
         AnisetteDataManager.shared.requestAnisetteData { [weak self] result in
-          guard let self = self else { return }
+            guard let self = self else {
+                completion(.failure(.noReportsFound))
+                return
+            }
             switch result {
             case .failure(_):
                 completion(.failure(.activatePlugin))

diff --git a/OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryMapAnnotation.swift b/OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryMapAnnotation.swift
@@ -46,7 +46,7 @@ class AccessoryAnnotationView: MKAnnotationView {
         guard let accessory = (self.annotation as? AccessoryAnnotation)?.accessory else { return }
         self.pinView?.removeFromSuperview()
         self.pinView = nil
-        self.pinView = NSHostingView(rootView: AccessoryPinView(accessory: accessory)) // TODO: LEAK! This view is not release properly
+        self.pinView = NSHostingView(rootView: AccessoryPinView(accessory: accessory))  // TODO: LEAK! This view is not release properly
 
         self.addSubview(pinView!)