Skip to content

Commit 1edd4ec

Browse files
adunstanadunstan
committed
Disallow invalid path elements in jsonb_set
Null path elements and, where the object is an array, invalid integer elements now cause an error. Incorrect behaviour noted by Thom Brown, patch from Dmitry Dolgov. Backpatch to 9.5 where jsonb_set was introduced
1 parent 6390c8c commit 1edd4ec

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

‎src/backend/utils/adt/jsonfuncs.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3724,6 +3724,9 @@ setPath(JsonbIterator **it, Datum *path_elems,
37243724
JsonbValue *res = NULL;
37253725
int r;
37263726

3727+
if (path_nulls[level])
3728+
elog(ERROR, "path element at the position %d is NULL", level + 1);
3729+
37273730
r = JsonbIteratorNext(it, &v, false);
37283731

37293732
switch (r)
@@ -3875,7 +3878,7 @@ setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
38753878
lindex = strtol(c, &badp, 10);
38763879
if (errno != 0 || badp == c || *badp != '\0' || lindex > INT_MAX ||
38773880
lindex < INT_MIN)
3878-
idx = nelems;
3881+
elog(ERROR, "path element at the position %d is not an integer", level + 1);
38793882
else
38803883
idx = lindex;
38813884
}

‎src/test/regress/expected/jsonb.out‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,11 +3127,7 @@ select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::j
31273127
(1 row)
31283128

31293129
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{d,NULL,0}', '[1,2,3]');
3130-
jsonb_set
3131-
---------------------------------------------------------------------
3132-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3133-
(1 row)
3134-
3130+
ERROR: path element at the position 2 is NULL
31353131
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{n}', '{"1": 2}');
31363132
jsonb_set
31373133
-------------------------------------------------------------------------
@@ -3151,11 +3147,7 @@ select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::j
31513147
(1 row)
31523148

31533149
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{d,NULL,0}', '{"1": 2}');
3154-
jsonb_set
3155-
---------------------------------------------------------------------
3156-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3157-
(1 row)
3158-
3150+
ERROR: path element at the position 2 is NULL
31593151
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{b,-1}', '"test"');
31603152
jsonb_set
31613153
--------------------------------------------------------------------------
@@ -3199,11 +3191,7 @@ select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{
31993191
(1 row)
32003192

32013193
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{b,-1e}'; -- invalid array subscript
3202-
?column?
3203-
---------------------------------------------------------------------
3204-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3205-
(1 row)
3206-
3194+
ERROR: path element at the position 2 is not an integer
32073195
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{d,1,0}';
32083196
?column?
32093197
------------------------------------------------------------------
@@ -3331,3 +3319,9 @@ select jsonb_set('[]','{-99}','{"foo":123}');
33313319
[{"foo": 123}]
33323320
(1 row)
33333321

3322+
select jsonb_set('{"a": [1, 2, 3]}', '{a, non_integer}', '"new_value"');
3323+
ERROR: path element at the position 2 is not an integer
3324+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, non_integer}', '"new_value"');
3325+
ERROR: path element at the position 3 is not an integer
3326+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, NULL}', '"new_value"');
3327+
ERROR: path element at the position 3 is NULL

‎src/test/regress/expected/jsonb_1.out‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,11 +3127,7 @@ select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::j
31273127
(1 row)
31283128

31293129
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{d,NULL,0}', '[1,2,3]');
3130-
jsonb_set
3131-
---------------------------------------------------------------------
3132-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3133-
(1 row)
3134-
3130+
ERROR: path element at the position 2 is NULL
31353131
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{n}', '{"1": 2}');
31363132
jsonb_set
31373133
-------------------------------------------------------------------------
@@ -3151,11 +3147,7 @@ select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::j
31513147
(1 row)
31523148

31533149
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{d,NULL,0}', '{"1": 2}');
3154-
jsonb_set
3155-
---------------------------------------------------------------------
3156-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3157-
(1 row)
3158-
3150+
ERROR: path element at the position 2 is NULL
31593151
select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{b,-1}', '"test"');
31603152
jsonb_set
31613153
--------------------------------------------------------------------------
@@ -3199,11 +3191,7 @@ select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{
31993191
(1 row)
32003192

32013193
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{b,-1e}'; -- invalid array subscript
3202-
?column?
3203-
---------------------------------------------------------------------
3204-
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [2, 3]}, "n": null}
3205-
(1 row)
3206-
3194+
ERROR: path element at the position 2 is not an integer
32073195
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb #- '{d,1,0}';
32083196
?column?
32093197
------------------------------------------------------------------
@@ -3331,3 +3319,9 @@ select jsonb_set('[]','{-99}','{"foo":123}');
33313319
[{"foo": 123}]
33323320
(1 row)
33333321

3322+
select jsonb_set('{"a": [1, 2, 3]}', '{a, non_integer}', '"new_value"');
3323+
ERROR: path element at the position 2 is not an integer
3324+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, non_integer}', '"new_value"');
3325+
ERROR: path element at the position 3 is not an integer
3326+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, NULL}', '"new_value"');
3327+
ERROR: path element at the position 3 is NULL

‎src/test/regress/sql/jsonb.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,3 +816,6 @@ select jsonb_set('{}','{x}','{"foo":123}');
816816
select jsonb_set('[]','{0}','{"foo":123}');
817817
select jsonb_set('[]','{99}','{"foo":123}');
818818
select jsonb_set('[]','{-99}','{"foo":123}');
819+
select jsonb_set('{"a": [1, 2, 3]}', '{a, non_integer}', '"new_value"');
820+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, non_integer}', '"new_value"');
821+
select jsonb_set('{"a": {"b": [1, 2, 3]}}', '{a, b, NULL}', '"new_value"');

0 commit comments

Comments
 (0)