database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00
Code Activity

Only allow returning string types or bytea from json_serialize

Browse Source 
These are documented to be the allowed types for the RETURNING clause,
but the restriction was not being enforced, which caused a segfault if
another type was specified. Add some testing for this.

Per report from a.kozhemyakin

Backpatch to release 15.
This commit is contained in:
Andrew Dunstan
2022-07-07 17:40:02 -04:00
parent 8821054210
commit 3c633f32b9
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/parser/parse_expr.c
View File

@ -4574,7 +4574,24 @@ transformJsonSerializeExpr(ParseState *pstate, JsonSerializeExpr *expr)
JsonReturning *returning;
if (expr->output)
{
returning = transformJsonOutput(pstate, expr->output, true);
if (returning->typid != BYTEAOID)
{
char typcategory;
bool typispreferred;
get_type_category_preferred(returning->typid, &typcategory,
&typispreferred);
if (typcategory != TYPCATEGORY_STRING)
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("cannot use RETURNING type %s in JSON_SERIALIZE",
format_type_be(returning->typid)),
errhint("Try returning a string type or bytea")));
}
}
else
{
/* RETURNING TEXT FORMAT JSON is by default */