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

diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index db8f292637fe92f68256dc95f42ce4c5e60479ea..713ec0e521d3b9a863c3b5be161fdc1fa1b90b5c 100644 (file)
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -1819,8 +1819,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)
@@ -1900,6 +1908,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;
@@ -1984,6 +2001,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;