diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2016-02-21 10:30:49 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2016-02-21 10:40:39 -0500 |
| commit | 68d68ff8333c106962d4a936e07eba24d63a2e07 (patch) | |
| tree | 823804eecb2e14bc0ebd5555d898217af9c1478f /src/backend/utils/adt/jsonb.c | |
| parent | a397f8268a6a315b8c6579124637cddc8f79ea71 (diff) | |
| download | postgresql-68d68ff8333c106962d4a936e07eba24d63a2e07.tar.gz postgresql-68d68ff8333c106962d4a936e07eba24d63a2e07.zip | |
Fix two-argument jsonb_object when called with empty arrays
Some over-eager copy-and-pasting on my part resulted in a nonsense
result being returned in this case. I have adopted the same pattern for
handling this case as is used in the one argument form of the function,
i.e. we just skip over the code that adds values to the object.
Diagnosis and patch from Michael Paquier, although not quite his
solution.
Fixes bug #13936.
Backpatch to 9.5 where jsonb_object was introduced.
Diffstat (limited to 'src/backend/utils/adt/jsonb.c')
| -rw-r--r-- | src/backend/utils/adt/jsonb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index 7e01432546d..14ce57e252d 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -1455,7 +1455,7 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS) errmsg("wrong number of array subscripts"))); if (nkdims == 0) - PG_RETURN_DATUM(CStringGetTextDatum("{}")); + goto close_object; deconstruct_array(key_array, TEXTOID, -1, false, 'i', @@ -1509,13 +1509,14 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS) (void) pushJsonbValue(&result.parseState, WJB_VALUE, &v); } - result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL); - pfree(key_datums); pfree(key_nulls); pfree(val_datums); pfree(val_nulls); +close_object: + result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL); + PG_RETURN_POINTER(JsonbValueToJsonb(result.res)); } |