From 997066f4456c0fc582e62a50e296c77360212049 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Mon, 4 May 2015 12:38:58 -0400 Subject: Fix two small bugs in json's populate_record_worker The first bug is not releasing a tupdesc when doing an early return out of the function. The second bug is a logic error in choosing when to do an early return if given an empty jsonb object. Bug reports from Pavel Stehule and Tom Lane respectively. Backpatch to 9.4 where these were introduced. --- src/backend/utils/adt/jsonfuncs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/backend/utils/adt/jsonfuncs.c') diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index 076b00f213c..1a9a060d4eb 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -2099,6 +2099,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname, if (hash_get_num_entries(json_hash) == 0 && rec) { hash_destroy(json_hash); + ReleaseTupleDesc(tupdesc); PG_RETURN_POINTER(rec); } } @@ -2107,8 +2108,11 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname, jb = PG_GETARG_JSONB(json_arg_num); /* same logic as for json */ - if (!have_record_arg && rec) + if (JB_ROOT_COUNT(jb) == 0 && rec) + { + ReleaseTupleDesc(tupdesc); PG_RETURN_POINTER(rec); + } } ncolumns = tupdesc->natts; -- cgit v1.2.3