Skip to content

Commit e6e804a

Browse files
committed
In transformRowExpr(), check for too many columns in the row.
A RowExpr with more than MaxTupleAttributeNumber columns would fail at execution anyway, since we cannot form a tuple datum with more than that many columns. While heap_form_tuple() has a check for too many columns, it emerges that there are some intermediate bits of code that don't check and can be driven to failure with sufficiently many columns. Checking this at parse time seems like the most appropriate place to install a defense, since we already check SELECT list length there. While at it, make the SELECT-list-length error use the same errcode (TOO_MANY_COLUMNS) as heap_form_tuple does, rather than the generic PROGRAM_LIMIT_EXCEEDED. Per bug #17561 from Egor Chindyaskin. The given test case crashes in all supported branches (and probably a lot further back), so all. Discussion: https://postgr.es/m/[email protected]
1 parent 665ca54 commit e6e804a

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

‎src/backend/parser/parse_expr.c

+8
Original file line numberDiff line numberDiff line change
@@ -2150,6 +2150,14 @@ transformRowExpr(ParseState *pstate, RowExpr *r, bool allowDefault)
21502150
newr->args = transformExpressionList(pstate, r->args,
21512151
pstate->p_expr_kind, allowDefault);
21522152

2153+
/* Disallow more columns than will fit in a tuple */
2154+
if (list_length(newr->args) > MaxTupleAttributeNumber)
2155+
ereport(ERROR,
2156+
(errcode(ERRCODE_TOO_MANY_COLUMNS),
2157+
errmsg("ROW expressions can have at most %d entries",
2158+
MaxTupleAttributeNumber),
2159+
parser_errposition(pstate, r->location)));
2160+
21532161
/* Barring later casting, we consider the type RECORD */
21542162
newr->row_typeid = RECORDOID;
21552163
newr->row_format = COERCE_IMPLICIT_CAST;

‎src/backend/parser/parse_node.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ free_parsestate(ParseState *pstate)
8282
*/
8383
if (pstate->p_next_resno - 1 > MaxTupleAttributeNumber)
8484
ereport(ERROR,
85-
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
85+
(errcode(ERRCODE_TOO_MANY_COLUMNS),
8686
errmsg("target lists can have at most %d entries",
8787
MaxTupleAttributeNumber)));
8888

0 commit comments

Comments
 (0)