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

fix(fs): avoid shadowing errors in file.glob (#9286)

Browse Source 
Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>
This commit is contained in:
Nikita Pivkin
2025-07-31 12:36:29 +06:00
committed by GitHub
parent c4003b2968
commit b51c789330
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/mapfs/file.go
View File

@@ -254,13 +254,16 @@ func (f *file) glob(pattern string) ([]string, error) {
var err error
f.files.Range(func(name string, sub *file) bool {
if ok, err := filepath.Match(parts[0], name); err != nil {
var ok bool
ok, err = filepath.Match(parts[0], name)
if err != nil {
return false
} else if ok {
if len(parts) == 1 {
entries = append(entries, name)
} else {
subEntries, err := sub.glob(strings.Join(parts[1:], separator))
var subEntries []string
subEntries, err = sub.glob(strings.Join(parts[1:], separator))
if err != nil {
return false
}

5
pkg/mapfs/fs_test.go
View File

@@ -394,6 +394,11 @@ func TestFS_Glob(t *testing.T) {
pattern: "nosuch",
wantErr: assert.NoError,
},
{
name: "invalid pattern",
pattern: "[abc",
wantErr: assert.Error,
},
}
for _, tt := range tests {