Merge cockroachdb#34757

34757: sql: fix missing null check in json sub array r=jordanlewis a=jordanlewis Fixes cockroachdb#34756. Release note (bug fix): fix panic when subtracting an array containing null from a json datum. Co-authored-by: Jordan Lewis <[email protected]>
ajwerner · Feb 8, 2019 · 40e4035 · 40e4035
2 parents 3981ac6 + 324adc0
commit 40e4035
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/json b/pkg/sql/logictest/testdata/logic_test/json
@@ -665,5 +665,11 @@ SELECT '{"b": [], "c": {"a": "b"}}'::JSONB - array['a'];
 ----
 {"b": [], "c": {"a": "b"}}
 
+# Regression test for #34756.
+query T
+SELECT '{"b": [], "c": {"a": "b"}}'::JSONB - array['foo', NULL]
+----
+{"b": [], "c": {"a": "b"}}
+
 statement error pgcode 22P02 a path element is not an integer: foo
 SELECT '{"a": {"b": ["foo"]}}'::JSONB #- ARRAY['a', 'b', 'foo']
diff --git a/pkg/sql/sem/tree/eval.go b/pkg/sql/sem/tree/eval.go
@@ -880,6 +880,9 @@ var BinOps = map[BinaryOperator]binOpOverload{
 				arr := *MustBeDArray(right)
 
 				for _, str := range arr.Array {
+					if str == DNull {
+						continue
+					}
 					var err error
 					j, _, err = j.RemoveString(string(MustBeDString(str)))
 					if err != nil {