NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitcf63c64

committed

Fix portability issue in ordered-set patch.

Overly compact coding in makeOrderedSetArgs() led to a platform dependency:if the compiler chose to execute the subexpressions in the wrong order,list_length() might get applied to an already-modified List, giving avalue we didn't want. Per buildfarm.

1 parent8d65da1 commitcf63c64Copy full SHA for cf63c64

File tree

1 file changed

-1

lines changed

src/backend/parser
- gram.y

1 file changed

-1

lines changed

`‎src/backend/parser/gram.y`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13385,6 +13385,7 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`13385`	`13385`	`core_yyscan_t yyscanner)`
`13386`	`13386`	`{`
`13387`	`13387`	`FunctionParameter lastd = (FunctionParameter ) llast(directargs);`
	`13388`	`+intndirectargs;`
`13388`	`13389`
`13389`	`13390`	`/* No restriction unless last direct arg is VARIADIC*/`
`13390`	`13391`	`if (lastd->mode == FUNC_PARAM_VARIADIC)`
`@@ -13407,8 +13408,11 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`13407`	`13408`	`orderedargs = NIL;`
`13408`	`13409`	`}`
`13409`	`13410`
	`13411`	`+/* don't merge into the next line, as list_concat changes directargs*/`
	`13412`	`+ndirectargs = list_length(directargs);`
	`13413`	`+`
`13410`	`13414`	`return list_make2(list_concat(directargs, orderedargs),`
`13411`		`- makeInteger(list_length(directargs)));`
	`13415`	`+ makeInteger(ndirectargs));`
`13412`	`13416`	`}`
`13413`	`13417`
`13414`	`13418`	`/* insertSelectOptions()`

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!

Commitcf63c64

File tree

1 file changed

1 file changed

`‎src/backend/parser/gram.y`

0 commit comments