oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-19 09:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix package.json parsing for no licenses

Browse Source 
Signed-off-by: Dan Luhring <dan.luhring@anchore.com>
This commit is contained in:
Dan Luhring 2020-11-14 11:01:14 -05:00
parent fc99538d78
commit f7be73dbcc
No known key found for this signature in database
GPG Key ID: 9CEE23D079426CEF
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syft/cataloger/javascript/parse_package_json.go
View File

@ -133,6 +133,11 @@ func licenseFromJSON(b []byte) (string, error) {
} }
func licensesFromJSON(p PackageJSON) ([]string, error) { func licensesFromJSON(p PackageJSON) ([]string, error) {
if p.License == nil && p.Licenses == nil {
// This package.json doesn't specify any licenses whatsoever
return []string{}, nil
}
singleLicense, err := licenseFromJSON(p.License) singleLicense, err := licenseFromJSON(p.License)
if err == nil { if err == nil {
return []string{singleLicense}, nil return []string{singleLicense}, nil