postgres.git / summary / log / commit / refs
commit 83f1793d6096deb419e16cc38201484a6f6e9f48
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon Aug 01 16:22:35 2022 +0000
First released in: 16.0, 10.22, 11.17, 12.12, 13.8, 14.5, 15.0
Check maximum number of columns in function RTEs, too.
I thought commit fd96d14d9 had plugged all the holes of this sort,
but no, function RTEs could produce oversize tuples too, either
via long coldeflists or just from multiple functions in one RTE.
(I'm pretty sure the other variants of base RTEs aren't a problem,
because they ultimately refer to either a table or a sub-SELECT,
whose widths are enforced elsewhere. But we explicitly allow join
RTEs to be overwidth, as long as you don't try to form their
tuple result.)
Per further discussion of bug #17561. As before, patch all branches.
Discussion: https://postgr.es/m/17561-80350151b9ad2ad4@postgresql.org
src/backend/parser/parse_relation.c | 35 ++++++++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 8d832efc620..f6b740df0ac 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -1841,8 +1841,16 @@ addRangeTableEntryForFunction(ParseState *pstate,
/*
* Use the column definition list to construct a tupdesc and fill
- * in the RangeTblFunction's lists.
+ * in the RangeTblFunction's lists. Limit number of columns to
+ * MaxHeapAttributeNumber, because CheckAttributeNamesTypes will.
*/
+ if (list_length(coldeflist) > MaxHeapAttributeNumber)
+ ereport(ERROR,
+ (errcode(ERRCODE_TOO_MANY_COLUMNS),
+ errmsg("column definition lists can have at most %d entries",
+ MaxHeapAttributeNumber),
+ parser_errposition(pstate,
+ exprLocation((Node *) coldeflist))));
tupdesc = CreateTemplateTupleDesc(list_length(coldeflist));
i = 1;
foreach(col, coldeflist)
@@ -1922,6 +1930,15 @@ addRangeTableEntryForFunction(ParseState *pstate,
if (rangefunc->ordinality)
totalatts++;
+ /* Disallow more columns than will fit in a tuple */
+ if (totalatts > MaxTupleAttributeNumber)
+ ereport(ERROR,
+ (errcode(ERRCODE_TOO_MANY_COLUMNS),
+ errmsg("functions in FROM can return at most %d columns",
+ MaxTupleAttributeNumber),
+ parser_errposition(pstate,
+ exprLocation((Node *) funcexprs))));
+
/* Merge the tuple descs of each function into a composite one */
tupdesc = CreateTemplateTupleDesc(totalatts);
natts = 0;
@@ -2004,11 +2021,23 @@ addRangeTableEntryForTableFunc(ParseState *pstate,
Alias *eref;
int numaliases;
+ Assert(pstate != NULL);
+
+ /* Disallow more columns than will fit in a tuple */
+ if (list_length(tf->colnames) > MaxTupleAttributeNumber)
+ ereport(ERROR,
+ (errcode(ERRCODE_TOO_MANY_COLUMNS),
+ errmsg("functions in FROM can return at most %d columns",
+ MaxTupleAttributeNumber),
+ parser_errposition(pstate,
+ exprLocation((Node *) tf))));
+ Assert(list_length(tf->coltypes) == list_length(tf->colnames));
+ Assert(list_length(tf->coltypmods) == list_length(tf->colnames));
+ Assert(list_length(tf->colcollations) == list_length(tf->colnames));
+
refname = alias ? alias->aliasname :
pstrdup(tf->functype == TFT_XMLTABLE ? "xmltable" : "json_table");
- Assert(pstate != NULL);
-
rte->rtekind = RTE_TABLEFUNC;
rte->relid = InvalidOid;
rte->subquery = NULL;
[parent: 8b1ec7d29532]