Fail gracefully when auxiliary tool cannot be located (#2436)

sparkle-project · Sep 7, 2023 · 7cc751f · 7cc751f
1 parent d005af3
commit 7cc751f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/InstallerLauncher/SUInstallerLauncher.m b/InstallerLauncher/SUInstallerLauncher.m
@@ -326,10 +326,17 @@ - (NSString *)pathForBundledTool:(NSString *)toolName extension:(NSString *)exte
     } else {
         auxiliaryToolURL = [bundle URLForAuxiliaryExecutable:nameWithExtension];
     }
-    assert(auxiliaryToolURL != nil);
+
+    if (auxiliaryToolURL == nil) {
+        SULog(SULogLevelError, @"Error: Cannot retrieve path for auxiliary tool: %@", nameWithExtension);
+        return nil;
+    }
 
     NSURL *resolvedAuxiliaryToolURL = [auxiliaryToolURL URLByResolvingSymlinksInPath];
-    assert(resolvedAuxiliaryToolURL != nil);
+    if (resolvedAuxiliaryToolURL == nil) {
+        SULog(SULogLevelError, @"Error: Cannot retrieve resolved path for auxiliary tool path: %@", auxiliaryToolURL.path);
+        return nil;
+    }
 
     return resolvedAuxiliaryToolURL.path;
 }