database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Fix another crash in json{b}_populate_recordset and json{b}_to_recordset.

Browse Source 
populate_recordset_worker() failed to consider the possibility that the
supplied JSON data contains no rows, so that update_cached_tupdesc never
got called.  This led to a null-pointer dereference since commit 9a5e8ed28;
before that it led to a bogus "set-valued function called in context that
cannot accept a set" error.  Fix by forcing the update to happen.

Per bug #15514.  Back-patch to v11 as 9a5e8ed28 was.  (If we were excited
about the bogus error, we could perhaps go back further, but it'd take more
work to figure out how to fix it in older branches.  Given the lack of
field complaints about that aspect, I'm not excited.)

Discussion: https://postgr.es/m/15514-59d5b4c4065b178b@postgresql.org
This commit is contained in:
Tom Lane
2018-11-22 15:14:01 -05:00
parent fe375d33a1
commit eba2ce1712
5 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/adt/jsonfuncs.c
View File

@ -3658,6 +3658,12 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
if (PG_ARGISNULL(json_arg_num))
PG_RETURN_NULL();
/*
* Forcibly update the cached tupdesc, to ensure we have the right tupdesc
* to return even if the JSON contains no rows.
*/
update_cached_tupdesc(&cache->c.io.composite, cache->fn_mcxt);
state = palloc0(sizeof(PopulateRecordsetState));
/* make tuplestore in a sufficiently long-lived memory context */