gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-23 07:29:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong break (fanal#38)

Browse Source
This commit is contained in:
Teppei Fukuda
2019-09-25 15:52:46 +03:00
committed by GitHub
parent 4a9f3d9aa9
commit cdeb41a58c
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
analyzer/pkg/rpm/rpm.go
View File

@@ -33,7 +33,10 @@ func (a rpmPkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.Pack
if !detected {
return nil, analyzer.ErrNoPkgsDetected
}
return pkgs, xerrors.Errorf("failed to parse the pkg info: %w", err)
if err != nil {
return nil, xerrors.Errorf("failed to parse the pkg info: %w", err)
}
return pkgs, nil
}
func (a rpmPkgAnalyzer) parsePkgInfo(packageBytes []byte) (pkgs []analyzer.Package, err error) {

5
analyzer/pkg/rpmcmd/rpm.go
View File

@@ -36,7 +36,10 @@ func (a rpmCmdPkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.P
if !detected {
return pkgs, analyzer.ErrNoPkgsDetected
}
return pkgs, xerrors.Errorf("failed to parse the pkg info: %w", err)
if err != nil {
return nil, xerrors.Errorf("failed to parse the pkg info: %w", err)
}
return pkgs, nil
}
func (a rpmCmdPkgAnalyzer) parsePkgInfo(packageBytes []byte) (pkgs []analyzer.Package, err error) {

2
extractor/docker/docker.go
View File

@@ -340,9 +340,9 @@ func (d DockerExtractor) ExtractFiles(layer io.Reader, filenames []string) (extr
if s[len(s)-1] == '/' {
if filepath.Clean(s) == filepath.Dir(filePath) {
extract = true
}
break
}
}
if s == filePath || s == fileName || strings.HasPrefix(fileName, wh) {
extract = true