octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-13 17:18:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Catch racy nil deref in ClusterConfig (#5106)

Browse Source
This commit is contained in:
Simon Frei 2018-08-11 09:10:29 +02:00 committed by Jakob Borg
parent 54d610878d
commit dfe4008607
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/model/model.go
View File

@ -953,12 +953,17 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
if cfg.Paused { if cfg.Paused {
continue continue
} }
fs, ok := m.folderFiles[folder.ID]
if !ok {
// Shouldn't happen because !cfg.Paused, but might happen
// if the folder is about to be unpaused, but not yet.
continue
}
if !folder.DisableTempIndexes { if !folder.DisableTempIndexes {
tempIndexFolders = append(tempIndexFolders, folder.ID) tempIndexFolders = append(tempIndexFolders, folder.ID)
} }
fs := m.folderFiles[folder.ID]
myIndexID := fs.IndexID(protocol.LocalDeviceID) myIndexID := fs.IndexID(protocol.LocalDeviceID)
mySequence := fs.Sequence(protocol.LocalDeviceID) mySequence := fs.Sequence(protocol.LocalDeviceID)
var startSequence int64 var startSequence int64