浏览代码

Fix sudden nil pointer dereference in walk

Jakob Borg 10 年之前
父节点
当前提交
37ed5a01e0
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      lib/scanner/walk.go

+ 1 - 1
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" ||
 		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
 			// An ignored file
 			if debug {
 			if debug {
 				l.Debugln("ignored:", rn)
 				l.Debugln("ignored:", rn)