Skip to content

Fix DaemonProcess launch uncaught exception when the executable path is invalid/non-executable #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xor-gate merged 4 commits into from
Apr 17, 2025
Merged

Fix DaemonProcess launch uncaught exception when the executable path is invalid/non-executable #243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21e583b
Fallback to default executable path of DaemonProcess path is invalid/…
egasato Mar 10, 2025
166724f
Fix logging typos
egasato Mar 10, 2025
86e1c93
Comment why checking the executable is necessary
egasato Apr 11, 2025
918a4c5
Normalize indentation to follow file's convention
egasato Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syncthing/DaemonProcess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ let MaxKeepLogLines = 200
}

private func launchSync() {
NSLog("Launching Syncthing daemon")
NSLog("Launching Syncthing daemon: \(path)")
shouldTerminate = false

// Since release v1.7.0-1 we don't allow Syncthing daemon to update by itself
Expand Down
10 changes: 10 additions & 0 deletions syncthing/STApplication.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ - (void)applicationLoadConfiguration {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

_executable = self.arguments = [defaults stringForKey:@"Executable"];
if (_executable) {
NSFileManager *fileManager = [NSFileManager defaultManager];
if (![fileManager fileExistsAtPath:_executable]) {
NSLog(@"Resetting Syncthing daemon executable path because it doesn't exist: (%@)", _executable);
_executable = nil;
} else if (![fileManager isExecutableFileAtPath:_executable]) {
NSLog(@"Resetting Syncthing daemon executable path because it's non-executable: (%@)", _executable);
_executable = nil;
}
}
if (!_executable) {
_executable = [NSString stringWithFormat:@"%@/%@",
[[NSBundle mainBundle] resourcePath],
Expand Down