perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Prevent nil deref if folder stopped (fixes #5780) (#5778)

Browse Source
This commit is contained in:
Simon Frei 2019-06-11 11:48:51 +02:00 committed by Jakob Borg
parent 21f50e2f8f
commit 13a746e0fb
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/model/model.go
View File

@ -59,8 +59,6 @@ type service interface {
GetStatistics() stats.FolderStatistics GetStatistics() stats.FolderStatistics
getState() (folderState, time.Time, error) getState() (folderState, time.Time, error)
setState(state folderState)
setError(err error)
} }
type Availability struct { type Availability struct {
@ -2072,15 +2070,6 @@ func (m *model) ScanFolders() map[string]error {
errorsMut.Lock() errorsMut.Lock()
errors[folder] = err errors[folder] = err
errorsMut.Unlock() errorsMut.Unlock()
// Potentially sets the error twice, once in the scanner just
// by doing a check, and once here, if the error returned is
// the same one as returned by CheckHealth, though
// duplicate set is handled by setError.
m.fmut.RLock()
srv := m.folderRunners[folder]
m.fmut.RUnlock()
srv.setError(err)
} }
wg.Done() wg.Done()
}() }()