Skip to content

fix panic in parseWith #129

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

Open
phameratl wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −1
Open

fix panic in parseWith #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c509e4
fix parseWith - panic if with followed by no tokens
phameratl Jan 16, 2026
234f721
unit test for panic fix for parseWith
phameratl Jan 16, 2026
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
2 changes: 1 addition & 1 deletion spdxexp/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ func (t *tokenStream) parseWith() *string {
}

token := t.peek()
if token.role != exceptionToken {
if token == nil || token.role != exceptionToken {
t.err = errors.New("expected exception after 'WITH'")
return nil
}
Expand Down
8 changes: 8 additions & 0 deletions spdxexp/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,7 @@ func TestParseWith(t *testing.T) {
{"WITH followed by EXCEPTION", getWithClauseTokens(1), "Bison-exception-2.2", false, 2, nil},
{"WITH not followed by EXCEPTION", getInvalidWithClauseTokens(1), "", true, 2, errors.New("expected exception after 'WITH'")},
{"not with", getOrClauseTokens(1), "", true, 1, nil},
{"WITH not followed by any tokens", getMalformedWithClauseTokens(1), "", true, 2, errors.New("expected exception after 'WITH'")},
}

for _, test := range tests {
Expand Down Expand Up @@ -1292,6 +1293,13 @@ func getInvalidWithClauseTokens(index int) *tokenStream {
return getTokenStream(tokens, index)
}

func getMalformedWithClauseTokens(index int) *tokenStream {
var tokens []token
tokens = append(tokens, token{role: licenseToken, value: "Apache-2.0"})
tokens = append(tokens, token{role: operatorToken, value: "WITH"})
return getTokenStream(tokens, index)
}

func getAndClauseTokens(index int) *tokenStream {
var tokens []token
tokens = append(tokens, token{role: licenseToken, value: "MIT"})
Expand Down