DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Fix nil ptr exception on invalid report prefilter

Browse Source
This commit is contained in:
Tomaž Jerman
2021-10-06 16:31:14 +02:00
parent d2e722688d
commit de0d6776b0
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/qlng/parser.go
View File

@@ -65,9 +65,17 @@ func (p *Parser) Parse(s string) (*ASTNode, error) {
if set, err := p.parse(p.nextToken()); err != nil {
return nil, err
} else if len(set) == 1 {
return set[0].ToAST(), set[0].Validate()
err := set[0].Validate()
if err != nil {
return nil, err
}
return set[0].ToAST(), nil
} else {
return set.ToAST(), set.Validate()
err := set.Validate()
if err != nil {
return nil, err
}
return set.ToAST(), nil
}
}

2
pkg/report/frame.go
View File

@@ -159,10 +159,10 @@ func (f *Filter) UnmarshalJSON(data []byte) (err error) {
}
aux, err := p.Parse(n.Raw)
aux.Raw = n.Raw
if err != nil {
return false, n, err
}
aux.Raw = n.Raw
return false, aux, nil
})