From 5c54d879a1241ce922527391572593b444c16dd7 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 17 May 2020 07:56:24 +0200 Subject: [PATCH] cmd/syncthing: Don't crash when failing to create default config (fixes #6655) (#6658) This is not an ignorable error, because it can happen if we fail to allocate a free port for the GUI or sync port on first startup. --- cmd/syncthing/main.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index c54359426..a99e86c7f 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -527,7 +527,10 @@ func (e errNoUpgrade) Error() string { } func checkUpgrade() (upgrade.Release, error) { - cfg, _ := loadOrDefaultConfig(protocol.EmptyDeviceID, events.NoopLogger) + cfg, err := loadOrDefaultConfig(protocol.EmptyDeviceID, events.NoopLogger) + if err != nil { + return upgrade.Release{}, err + } opts := cfg.Options() release, err := upgrade.LatestRelease(opts.ReleasesURL, build.Version, opts.UpgradeToPreReleases) if err != nil {