aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-06-01 11:12:56 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-06-01 11:12:56 -0400
commit1103033aedc10295eb689a4b7158f21ef4c14a11 (patch)
tree0d8f24b4d84edc7531a7dd1a44e16a9c56ba07fc /src/backend/utils/adt
parenteb89cb43a0d0e401e71b8e2345b5f5bc8b2755a1 (diff)
downloadpostgresql-1103033aedc10295eb689a4b7158f21ef4c14a11.tar.gz
postgresql-1103033aedc10295eb689a4b7158f21ef4c14a11.zip
Reject SELECT ... GROUP BY GROUPING SETS (()) FOR UPDATE.
This case should be disallowed, just as FOR UPDATE with a plain GROUP BY is disallowed; FOR UPDATE only makes sense when each row of the query result can be identified with a single table row. However, we missed teaching CheckSelectLocking() to check groupingSets as well as groupClause, so that it would allow degenerate grouping sets. That resulted in a bad plan and a null-pointer dereference in the executor. Looking around for other instances of the same bug, the only one I found was in examine_simple_variable(). That'd just lead to silly estimates, but it should be fixed too. Per private report from Yaoguang Chen. Back-patch to all supported branches.
Diffstat (limited to 'src/backend/utils/adt')
-rw-r--r--src/backend/utils/adt/selfuncs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 37ddda77240..0c8c05f6c2e 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -5497,7 +5497,8 @@ examine_simple_variable(PlannerInfo *root, Var *var,
* of learning something even with it.
*/
if (subquery->setOperations ||
- subquery->groupClause)
+ subquery->groupClause ||
+ subquery->groupingSets)
return;
/*