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

Fix CycloneDX license decoding panic (#898)

Browse Source
This commit is contained in:
Keith Zantow 2022-03-18 09:44:51 -04:00 committed by GitHub
parent f4734d28b3
commit 99c3339810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/formats/common/cyclonedxhelpers/decoder_test.go
View File

@ -272,4 +272,14 @@ func Test_missingDataDecode(t *testing.T) {
_, err = toSyftModel(bom) _, err = toSyftModel(bom)
assert.NoError(t, err) assert.NoError(t, err)
pkg := decodeComponent(&cyclonedx.Component{
Licenses: &cyclonedx.Licenses{
{
License: nil,
},
},
})
assert.Len(t, pkg.Licenses, 0)
} }

4
internal/formats/common/cyclonedxhelpers/licenses.go
View File

@ -26,7 +26,9 @@ func encodeLicenses(p pkg.Package) *cyclonedx.Licenses {
func decodeLicenses(c *cyclonedx.Component) (out []string) { func decodeLicenses(c *cyclonedx.Component) (out []string) {
if c.Licenses != nil { if c.Licenses != nil {
for _, l := range *c.Licenses { for _, l := range *c.Licenses {
out = append(out, l.License.ID) if l.License != nil {
out = append(out, l.License.ID)
}
} }
} }
return return