cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add further nil checks (fixes #862, ref #864)

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-10-15 15:54:55 +01:00
parent a778b410b9
commit 86346aa332
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/model/model.go
View File

@ -438,7 +438,7 @@ func (m *Model) Index(deviceID protocol.DeviceID, folder string, fs []protocol.F
for i := 0; i < len(fs); { for i := 0; i < len(fs); {
lamport.Default.Tick(fs[i].Version) lamport.Default.Tick(fs[i].Version)
if ignores.Match(fs[i].Name) { if ignores != nil && ignores.Match(fs[i].Name) {
fs[i] = fs[len(fs)-1] fs[i] = fs[len(fs)-1]
fs = fs[:len(fs)-1] fs = fs[:len(fs)-1]
} else { } else {
@ -479,7 +479,7 @@ func (m *Model) IndexUpdate(deviceID protocol.DeviceID, folder string, fs []prot
for i := 0; i < len(fs); { for i := 0; i < len(fs); {
lamport.Default.Tick(fs[i].Version) lamport.Default.Tick(fs[i].Version)
if ignores.Match(fs[i].Name) { if ignores != nil && ignores.Match(fs[i].Name) {
fs[i] = fs[len(fs)-1] fs[i] = fs[len(fs)-1]
fs = fs[:len(fs)-1] fs = fs[:len(fs)-1]
} else { } else {
@ -877,7 +877,7 @@ func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, fol
maxLocalVer = f.LocalVersion maxLocalVer = f.LocalVersion
} }
if ignores.Match(f.Name) { if ignores != nil && ignores.Match(f.Name) {
return true return true
} }
@ -1077,7 +1077,7 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
batch = batch[:0] batch = batch[:0]
} }
if ignores.Match(f.Name) { if ignores != nil && ignores.Match(f.Name) {
// File has been ignored. Set invalid bit. // File has been ignored. Set invalid bit.
nf := protocol.FileInfo{ nf := protocol.FileInfo{
Name: f.Name, Name: f.Name,