NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5223dda

committed

Remove residual NULL-pstate handling in addRangeTableEntry.

Passing a NULL pstate wouldn't actually work, because isLockedRefname()isn't prepared to cope with it; and there hasn't been any in-core codethat tries in over a decade. So just remove the residual NULL handling.Spotted by Coverity; analysis and patch by Michael Paquier.

1 parenta2e35b5 commit5223ddaCopy full SHA for 5223dda

File tree

1 file changed

-5

lines changed

src/backend/parser
- parse_relation.c

1 file changed

-5

lines changed

`‎src/backend/parser/parse_relation.c`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -993,9 +993,6 @@ parserOpenTable(ParseState pstate, const RangeVar relation, int lockmode)`
`993`	`993`	`/*`
`994`	`994`	`* Add an entry for a relation to the pstate's range table (p_rtable).`
`995`	`995`	`*`
`996`		`- * If pstate is NULL, we just build an RTE and return it without adding it`
`997`		`- * to an rtable list.`
`998`		`- *`
`999`	`996`	`* Note: formerly this checked for refname conflicts, but that's wrong.`
`1000`	`997`	`* Caller is responsible for checking for conflicts in the appropriate scope.`
`1001`	`998`	`*/`
`@@ -1011,6 +1008,8 @@ addRangeTableEntry(ParseState *pstate,`
`1011`	`1008`	`LOCKMODElockmode;`
`1012`	`1009`	`Relationrel;`
`1013`	`1010`
	`1011`	`+Assert(pstate!=NULL);`
	`1012`	`+`
`1014`	`1013`	`rte->rtekind=RTE_RELATION;`
`1015`	`1014`	`rte->alias=alias;`
`1016`	`1015`
`@@ -1058,8 +1057,7 @@ addRangeTableEntry(ParseState *pstate,`
`1058`	`1057`	`* Add completed RTE to pstate's range table list, but not to join list`
`1059`	`1058`	`* nor namespace --- caller must do that if appropriate.`
`1060`	`1059`	`*/`
`1061`		`-if (pstate!=NULL)`
`1062`		`-pstate->p_rtable=lappend(pstate->p_rtable,rte);`
	`1060`	`+pstate->p_rtable=lappend(pstate->p_rtable,rte);`
`1063`	`1061`
`1064`	`1062`	`returnrte;`
`1065`	`1063`	`}`

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!

Commit5223dda

File tree

1 file changed

1 file changed

`‎src/backend/parser/parse_relation.c`

0 commit comments