Skip to content

Commit 39328d3

Browse files
authored
Merge pull request #194 from CycloneDX/fix-nil-pointer-deref
fix: `nil` pointer dereference during evidence conversion
2 parents 6f53207 + ce43b6f commit 39328d3

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

convert.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,15 @@ func convertEvidence(c *Component, specVersion SpecVersion) {
195195
}
196196

197197
if specVersion < SpecVersion1_6 {
198-
for i := range *c.Evidence.Occurrences {
199-
occ := &(*c.Evidence.Occurrences)[i]
200-
201-
occ.Line = nil
202-
occ.Offset = nil
203-
occ.Symbol = ""
204-
occ.AdditionalContext = ""
198+
if c.Evidence.Occurrences != nil {
199+
for i := range *c.Evidence.Occurrences {
200+
occ := &(*c.Evidence.Occurrences)[i]
201+
202+
occ.Line = nil
203+
occ.Offset = nil
204+
occ.Symbol = ""
205+
occ.AdditionalContext = ""
206+
}
205207
}
206208
}
207209

validate_json_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package cyclonedx
1919

2020
import (
21+
"errors"
2122
"fmt"
2223

2324
"github.com/xeipuuv/gojsonschema"
@@ -60,5 +61,5 @@ func (jv jsonValidator) Validate(bom []byte, specVersion SpecVersion) error {
6061
errSummary += fmt.Sprintf("\n - %s", verr.String())
6162
}
6263

63-
return fmt.Errorf(errSummary)
64+
return errors.New(errSummary)
6465
}

0 commit comments

Comments
 (0)