Fix two small bugs in json's populate_record_worker

adunstan · adunstan · commit 997066f4456c · 2015-05-04T12:43:16.000-04:00
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.
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -2099,6 +2099,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,`
`2099`	`2099`	`if (hash_get_num_entries(json_hash) == 0 && rec)`
`2100`	`2100`	`{`
`2101`	`2101`	`hash_destroy(json_hash);`
	`2102`	`+ ReleaseTupleDesc(tupdesc);`
`2102`	`2103`	`PG_RETURN_POINTER(rec);`
`2103`	`2104`	`}`
`2104`	`2105`	`}`
`@@ -2107,8 +2108,11 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,`
`2107`	`2108`	`jb = PG_GETARG_JSONB(json_arg_num);`
`2108`	`2109`
`2109`	`2110`	`/* same logic as for json */`
`2110`		`- if (!have_record_arg && rec)`
	`2111`	`+ if (JB_ROOT_COUNT(jb) == 0 && rec)`
	`2112`	`+ {`
	`2113`	`+ ReleaseTupleDesc(tupdesc);`
`2111`	`2114`	`PG_RETURN_POINTER(rec);`
	`2115`	`+ }`
`2112`	`2116`	`}`
`2113`	`2117`
`2114`	`2118`	`ncolumns = tupdesc->natts;`