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

Fix crash on walker error (fixes #1507)

Browse Source
This commit is contained in:
Audrius Butkevicius 2015-03-22 14:06:29 +00:00
parent a7492f8612
commit 2e1e8f764e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/scanner/walk.go
View File

@ -111,7 +111,8 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
// Return value used when we are returning early and don't want to // Return value used when we are returning early and don't want to
// process the item. For directories, this means do-not-descend. // process the item. For directories, this means do-not-descend.
var skip error // nil var skip error // nil
if info.IsDir() { // info nil when error is not nil
if info != nil && info.IsDir() {
skip = filepath.SkipDir skip = filepath.SkipDir
} }

8
internal/scanner/walk_test.go
View File

@ -259,6 +259,14 @@ func TestNormalization(t *testing.T) {
} }
} }
func TestIssue1507(t *testing.T) {
w := Walker{}
c := make(chan protocol.FileInfo, 100)
fn := w.walkAndHashFiles(c)
fn("", nil, protocol.ErrClosed)
}
func walkDir(dir string) ([]protocol.FileInfo, error) { func walkDir(dir string) ([]protocol.FileInfo, error) {
w := Walker{ w := Walker{
Dir: dir, Dir: dir,