From 37ed5a01e092b1712cb4cd8346b18be24d3cc271 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Fri, 4 Sep 2015 13:13:00 +0200 Subject: [PATCH] Fix sudden nil pointer dereference in walk --- lib/scanner/walk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index 68357ece..0d3aec0f 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -240,7 +240,7 @@ func (w *Walker) walkAndHashFiles(fchan, dchan chan protocol.FileInfo) filepath. } if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stfolder" || - strings.HasPrefix(rn, ".stversions") || w.Matcher.Match(rn) { + strings.HasPrefix(rn, ".stversions") || (w.Matcher != nil && w.Matcher.Match(rn)) { // An ignored file if debug { l.Debugln("ignored:", rn)