Merge pull request #3 from zhouzhuojie/zz/fix-null-json-value

Fix null json value
zhouzhuojie · May 1, 2018 · 34882af · 34882af
2 parents c70410a + 461ba1d
commit 34882af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/evaluator.go b/evaluator.go
@@ -69,7 +69,11 @@ func evaluateSubtree(expr Expr, args map[string]interface{}) (Expr, error) {
 			return falseExpr, fmt.Errorf("argument: %v not found", index)
 		}
 
-		kind := reflect.TypeOf(args[index]).Kind()
+		typeof := reflect.TypeOf(args[index])
+		if typeof == nil {
+			return falseExpr, fmt.Errorf("Unsupported argument nil type")
+		}
+		kind := typeof.Kind()
 		switch kind {
 		case reflect.Int:
 			return &NumberLiteral{Val: float64(args[index].(int))}, nil

diff --git a/parser_test.go b/parser_test.go
@@ -321,6 +321,8 @@ func TestJSON(t *testing.T) {
 		{`{foo} contains 123`, `{"foo": ["123"]}`, false, true},
 		{`{foo} not contains 123`, `{"foo": [124]}`, true, false},
 		{`{foo} not contains "123"`, `{"foo": ["124"]}`, true, false},
+		{`{foo} not contains "123"`, `{"foo": null}`, false, true},
+		{`{foo} not contains "123"`, `{}`, false, true},
 	}
 
 	for _, test := range tests {