Skip to content

fix(conda): memory leak by adding closure method for package.json file #9349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikpivkin merged 2 commits into from
Aug 20, 2025
Merged

fix(conda): memory leak by adding closure method for package.json file #9349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f68dd8f
fix memory leak by adding closure method for file
Szulock Aug 18, 2025
7426b65
refactor: move license detection in separate function
DmitriyLewen Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions pkg/fanal/analyzer/language/conda/environment/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,7 @@ func findLicenseFromEnvDir(pkg types.Package, prefix string) ([]string, error) {
return nil, xerrors.Errorf("incorrect packageJSON file pattern: %w", err)
}
if matched {
file, err := os.Open(filepath.Join(condaMetaDir, entry.Name()))
if err != nil {
return nil, xerrors.Errorf("unable to open packageJSON file: %w", err)
}
packageJson, _, err := meta.NewParser().Parse(file)
if err != nil {
return nil, xerrors.Errorf("unable to parse packageJSON file: %w", err)
}
// packageJson always contain only 1 element
// cf. https://github.com/aquasecurity/trivy/blob/c3192f061d7e84eaf38df8df7c879dc00b4ca137/pkg/dependency/parser/conda/meta/parse.go#L39-L45
return packageJson[0].Licenses, nil
return licenseFromPackageJson(condaMetaDir, entry.Name())
}
}
return nil, xerrors.Errorf("meta file didn't find")
Expand All @@ -117,3 +107,20 @@ func (a environmentAnalyzer) Type() analyzer.Type {
func (a environmentAnalyzer) Version() int {
return version
}

func licenseFromPackageJson(condaMetaDir, fileName string) ([]string, error) {
file, err := os.Open(filepath.Join(condaMetaDir, fileName))
if err != nil {
return nil, xerrors.Errorf("unable to open packageJSON file: %w", err)
}

defer file.Close()

packageJson, _, err := meta.NewParser().Parse(file)
if err != nil {
return nil, xerrors.Errorf("unable to parse packageJSON file: %w", err)
}
// packageJson always contain only 1 element
// cf. https://github.com/aquasecurity/trivy/blob/c3192f061d7e84eaf38df8df7c879dc00b4ca137/pkg/dependency/parser/conda/meta/parse.go#L39-L45
return packageJson[0].Licenses, nil
}