From 3c633f32b9c712cc0b4c8d946f0eeae04a3ff51a Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Thu, 7 Jul 2022 17:40:02 -0400 Subject: Only allow returning string types or bytea from json_serialize 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. --- src/backend/parser/parse_expr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/backend/parser/parse_expr.c') diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 0dc2fc472e5..efcf1cd5abc 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -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 */ -- cgit v1.2.3