Skip to content

Fix null deref #20

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
tonymeehan merged 1 commit into from
May 16, 2025
Merged

Fix null deref #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 36 additions & 17 deletions pkg/parser/tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,21 @@ import (
)

var (
ErrRuleNotFound = errors.New("rule not found")
ErrNotSupported = errors.New("not supported")
ErrTermNotFound = errors.New("term not found")
ErrMissingOrder = errors.New("'sequence' missing 'order'")
ErrMissingMatch = errors.New("'set' missing 'match'")
ErrInvalidWindow = errors.New("invalid 'window'")
ErrTermsMapping = errors.New("'terms' must be a mapping")
ErrDuplicateTerm = errors.New("duplicate term name")
ErrMissingRuleId = errors.New("missing rule id")
ErrMissingRuleHash = errors.New("missing rule hash")
ErrMissingCreId = errors.New("missing cre id")
ErrInvalidCreId = errors.New("invalid cre id")
ErrInvalidRuleId = errors.New("invalid rule id (must be base58)")
ErrInvalidRuleHash = errors.New("invalid rule hash (must be base58)")
ErrRuleNotFound = errors.New("rule not found")
ErrRuleRootNotFound = errors.New("missing rule section")
ErrNotSupported = errors.New("not supported")
ErrTermNotFound = errors.New("term not found")
ErrMissingOrder = errors.New("'sequence' missing 'order'")
ErrMissingMatch = errors.New("'set' missing 'match'")
ErrInvalidWindow = errors.New("invalid 'window'")
ErrTermsMapping = errors.New("'terms' must be a mapping")
ErrDuplicateTerm = errors.New("duplicate term name")
ErrMissingRuleId = errors.New("missing rule id")
ErrMissingRuleHash = errors.New("missing rule hash")
ErrMissingCreId = errors.New("missing cre id")
ErrInvalidCreId = errors.New("invalid cre id")
ErrInvalidRuleId = errors.New("invalid rule id (must be base58)")
ErrInvalidRuleHash = errors.New("invalid rule hash (must be base58)")
)

var (
Expand Down Expand Up @@ -220,7 +221,13 @@ func buildTree(termsT map[string]ParseTermT, r ParseRuleT, ruleNode *yaml.Node,

n, ok = findChild(ruleNode, docRule)
if !ok {
return nil, root.WrapError(ErrRuleNotFound)
return nil, pqerr.Wrap(
pqerr.Pos{Line: ruleNode.Line, Col: ruleNode.Column},
r.Metadata.Id,
r.Metadata.Hash,
r.Cre.Id,
ErrRuleRootNotFound,
)
}

switch {
Expand Down Expand Up @@ -273,7 +280,13 @@ func buildSequenceTree(root *NodeT, termsT map[string]ParseTermT, r ParseRuleT,

orderYn, ok = findChild(ruleNode, docOrder)
if !ok {
return nil, root.WrapError(ErrMissingOrder)
return nil, pqerr.Wrap(
pqerr.Pos{Line: ruleNode.Line, Col: ruleNode.Column},
r.Metadata.Id,
r.Metadata.Hash,
r.Cre.Id,
ErrMissingOrder,
)
}

// Negate is optional
Expand Down Expand Up @@ -313,7 +326,13 @@ func buildSetTree(root *NodeT, termsT map[string]ParseTermT, r ParseRuleT, ruleN

matchYn, ok = findChild(ruleNode, docMatch)
if !ok {
return nil, root.WrapError(ErrMissingMatch)
return nil, pqerr.Wrap(
pqerr.Pos{Line: ruleNode.Line, Col: ruleNode.Column},
r.Metadata.Id,
r.Metadata.Hash,
r.Cre.Id,
ErrMissingMatch,
)
}

// Negate is optional
Expand Down