fix: correct error mismatch causing race in fast walks (#5482)

lebauce · web-flow · commit 8656bd9f774a · 2023-11-02T04:14:16.000Z
diff --git a/pkg/fanal/artifact/local/fs.go b/pkg/fanal/artifact/local/fs.go
@@ -143,7 +143,7 @@ func (a Artifact) Inspect(ctx context.Context) (types.ArtifactReference, error)
 			dir, filePath = path.Split(a.rootPath)
 		}
 
-		if err = a.analyzer.AnalyzeFile(ctx, &wg, limit, result, dir, filePath, info, opener, nil, opts); err != nil {
+		if err := a.analyzer.AnalyzeFile(ctx, &wg, limit, result, dir, filePath, info, opener, nil, opts); err != nil {
 			return xerrors.Errorf("analyze file (%s): %w", filePath, err)
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func (a Artifact) Inspect(ctx context.Context) (types.ArtifactReference, error)`
`143`	`143`	`dir, filePath = path.Split(a.rootPath)`
`144`	`144`	`}`
`145`	`145`
`146`		`- if err = a.analyzer.AnalyzeFile(ctx, &wg, limit, result, dir, filePath, info, opener, nil, opts); err != nil {`
	`146`	`+ if err := a.analyzer.AnalyzeFile(ctx, &wg, limit, result, dir, filePath, info, opener, nil, opts); err != nil {`
`147`	`147`	`return xerrors.Errorf("analyze file (%s): %w", filePath, err)`
`148`	`148`	`}`
`149`	`149`