Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfd96d14

Browse files
committed
In transformRowExpr(), check for too many columns in the row.
A RowExpr with more than MaxTupleAttributeNumber columns would fail atexecution anyway, since we cannot form a tuple datum with more than thatmany columns. While heap_form_tuple() has a check for too many columns,it emerges that there are some intermediate bits of code that don'tcheck and can be driven to failure with sufficiently many columns.Checking this at parse time seems like the most appropriate place toinstall 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 genericPROGRAM_LIMIT_EXCEEDED.Per bug #17561 from Egor Chindyaskin. The given test case crashesin all supported branches (and probably a lot further back),so patch all.Discussion:https://postgr.es/m/17561-80350151b9ad2ad4@postgresql.org
1 parent80d6907 commitfd96d14

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

‎src/backend/parser/parse_expr.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,14 @@ transformRowExpr(ParseState *pstate, RowExpr *r, bool allowDefault)
21402140
newr->args=transformExpressionList(pstate,r->args,
21412141
pstate->p_expr_kind,allowDefault);
21422142

2143+
/* Disallow more columns than will fit in a tuple */
2144+
if (list_length(newr->args)>MaxTupleAttributeNumber)
2145+
ereport(ERROR,
2146+
(errcode(ERRCODE_TOO_MANY_COLUMNS),
2147+
errmsg("ROW expressions can have at most %d entries",
2148+
MaxTupleAttributeNumber),
2149+
parser_errposition(pstate,r->location)));
2150+
21432151
/* Barring later casting, we consider the type RECORD */
21442152
newr->row_typeid=RECORDOID;
21452153
newr->row_format=COERCE_IMPLICIT_CAST;

‎src/backend/parser/parse_node.c

Lines changed: 1 addition & 1 deletion
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)
[8]ページ先頭
©2009-2025 Movatter.jp