From c9349183478321cc434b92cd8d7dc9bfefed82db Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 12 Dec 2018 12:09:39 +0100 Subject: [PATCH] lib/scanner: Fix empty path on normalization error (fixes #5369) (#5370) --- lib/scanner/walk.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index eb8f2a4d..8a719b6a 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -295,9 +295,10 @@ func (w *walker) handleItem(ctx context.Context, path string, toHashChan chan<- return skip } + oldPath := path path, err = w.normalizePath(path, info) if err != nil { - w.handleError(ctx, "normalizing path", path, err, finishedChan) + w.handleError(ctx, "normalizing path", oldPath, err, finishedChan) return skip }