lib/scanner, lib/fs: Don't create file infos with abs paths (fixes #4799) (#4800)

2018-03-12 13:18:59 +01:00
parent 2bdb37d412
commit 8b4346c3ec
11 changed files with 212 additions and 153 deletions
--- a/lib/fs/walkfs.go
+++ b/lib/fs/walkfs.go
@@ -38,7 +38,12 @@ func NewWalkFilesystem(next Filesystem) Filesystem {

 // walk recursively descends path, calling walkFn.
 func (f *walkFilesystem) walk(path string, info FileInfo, walkFn WalkFunc) error {
-	err := walkFn(path, info, nil)
+	path, err := Canonicalize(path)
+	if err != nil {
+		return err
+	}
+
+	err = walkFn(path, info, nil)
 	if err != nil {
 		if info.IsDir() && err == SkipDir {
 			return nil