oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: close temp rpmdb file (#2792)

Browse Source 
* fix: close temp rpmdb file and db

Signed-off-by: guoguangwu <guoguangwug@gmail.com>

* chore: fix linter

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>

---------

Signed-off-by: guoguangwu <guoguangwug@gmail.com>
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Co-authored-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
guangwu 2024-05-01 00:47:17 +08:00 committed by GitHub
parent 02dc2dfa9b
commit 25b55e1704
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syft/pkg/cataloger/redhat/parse_rpm_db.go
View File

@ -17,6 +17,7 @@ import (
) )
// parseRpmDb parses an "Packages" RPM DB and returns the Packages listed within it. // parseRpmDb parses an "Packages" RPM DB and returns the Packages listed within it.
// nolint:funlen
func parseRpmDB(_ context.Context, resolver file.Resolver, env *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) { func parseRpmDB(_ context.Context, resolver file.Resolver, env *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) {
f, err := os.CreateTemp("", "rpmdb") f, err := os.CreateTemp("", "rpmdb")
if err != nil { if err != nil {
@ -24,6 +25,10 @@ func parseRpmDB(_ context.Context, resolver file.Resolver, env *generic.Environm
} }
defer func() { defer func() {
err = f.Close()
if err != nil {
log.Errorf("failed to close temp rpmdb file: %+v", err)
}
err = os.Remove(f.Name()) err = os.Remove(f.Name())
if err != nil { if err != nil {
log.Errorf("failed to remove temp rpmdb file: %+v", err) log.Errorf("failed to remove temp rpmdb file: %+v", err)
@ -39,6 +44,7 @@ func parseRpmDB(_ context.Context, resolver file.Resolver, env *generic.Environm
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
defer db.Close()
pkgList, err := db.ListPackages() pkgList, err := db.ListPackages()
if err != nil { if err != nil {