rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Tom Lane 2022-08-01 12:22:35 -04:00
parent aadaaeff4c
commit 331f8b851c
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/parser/parse_relation.c
View File

@ -1781,8 +1781,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)
@ -1862,6 +1870,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;
@ -1946,6 +1963,18 @@ addRangeTableEntryForTableFunc(ParseState *pstate,
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));
rte->rtekind = RTE_TABLEFUNC;
rte->relid = InvalidOid;
rte->subquery = NULL;