NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitebc584e

committed

Harden range_table_mutator() against null RangeTblEntry.subquery.

Commit64919aa made pull_up_simple_subquery set rte->subquery = NULLafter doing the deed, so that we don't waste cycles copying anow-useless subquery tree around. This turns out to create a core dumphazard in range_table_mutator, which supposes that that field is neverNULL. Apparently none of our own code invokes query_tree_mutator orrange_table_mutator on the top Query after subquery pullup; but itwouldn't be surprising if outside code does, and anyway I'm workingon a v16 patch that will need it.We can fix this cleanly by just getting rid of the special-casehandling of this field and treating it more like all the rest.I think the special case might be left over from a time whenQTW_DONT_COPY_QUERY was the default behavior, but that was eons ago.Thanks to Dean Rasheed for review.Discussion:https://postgr.es/m/545569.1656107045@sss.pgh.pa.us

1 parent3ab4fc5 commitebc584eCopy full SHA for ebc584e

File tree

1 file changed

-12

lines changed

src/backend/nodes
- nodeFuncs.c

1 file changed

-12

lines changed

`‎src/backend/nodes/nodeFuncs.c`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -2825,11 +2825,6 @@ expression_tree_mutator(Node *node,`
`2825`	`2825`	`( (newnode) = (nodetype *) palloc(sizeof(nodetype)), \`
`2826`	`2826`	`memcpy((newnode), (node), sizeof(nodetype)) )`
`2827`	`2827`
`2828`		`-#defineCHECKFLATCOPY(newnode,node,nodetype)\`
`2829`		`-( AssertMacro(IsA((node), nodetype)), \`
`2830`		`- (newnode) = (nodetype *) palloc(sizeof(nodetype)), \`
`2831`		`- memcpy((newnode), (node), sizeof(nodetype)) )`
`2832`		`-`
`2833`	`2828`	`#defineMUTATE(newfield,oldfield,fieldtype) \`
`2834`	`2829`	`( (newfield) = (fieldtype) mutator((Node *) (oldfield), context) )`
`2835`	`2830`
`@@ -3640,9 +3635,9 @@ expression_tree_mutator(Node *node,`
`3640`	`3635`	`* which is the bitwise OR of flag values to suppress mutating of`
`3641`	`3636`	`* indicated items. (More flag bits may be added as needed.)`
`3642`	`3637`	`*`
`3643`		`- * Normally the Query node itself is copied, but some callers want it to be`
`3644`		`- * modified in-place; they must pass QTW_DONT_COPY_QUERY in flags. All`
`3645`		`- * modified substructure is safely copied in any case.`
	`3638`	`+ * Normally thetop-levelQuery node itself is copied, but some callers want`
	`3639`	`+ *it to bemodified in-place; they must pass QTW_DONT_COPY_QUERY in flags.`
	`3640`	`+ *Allmodified substructure is safely copied in any case.`
`3646`	`3641`	`*/`
`3647`	`3642`	`Query*`
`3648`	`3643`	`query_tree_mutator(Query*query,`
`@@ -3758,10 +3753,7 @@ range_table_mutator(List *rtable,`
`3758`	`3753`	`break;`
`3759`	`3754`	`caseRTE_SUBQUERY:`
`3760`	`3755`	`if (!(flags&QTW_IGNORE_RT_SUBQUERIES))`
`3761`		`-{`
`3762`		`-CHECKFLATCOPY(newrte->subquery,rte->subquery,Query);`
`3763`		`-MUTATE(newrte->subquery,newrte->subquery,Query*);`
`3764`		`-}`
	`3756`	`+MUTATE(newrte->subquery,rte->subquery,Query*);`
`3765`	`3757`	`else`
`3766`	`3758`	`{`
`3767`	`3759`	`/* else, copy RT subqueries as-is */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitebc584e

File tree

1 file changed

1 file changed

`‎src/backend/nodes/nodeFuncs.c`

0 commit comments