NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit29987b2

committed

Avoid crash in "postgres -C guc" for a GUC with a null string value.

Emit "(null)" instead, which was the behavior all along on platformsthat don't crash, eg OS X. Per report from Jehan-Guillaume de Rorthais.Back-patch to 9.2 where -C option was introduced.Michael PaquierReport: <20160615204036.2d35d86a@firost>

1 parent832c3f9 commit29987b2Copy full SHA for 29987b2

File tree

1 file changed

-3

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

-3

lines changed

`‎src/backend/postmaster/postmaster.c`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -847,10 +847,14 @@ PostmasterMain(int argc, char *argv[])`
`847`	`847`	`if (output_config_variable!=NULL)`
`848`	`848`	`{`
`849`	`849`	`/*`
`850`		`- * permission is handled because the user is reading inside the data`
`851`		`- * dir`
	`850`	`+ * "-C guc" was specified, so print GUC's value and exit. No extra`
	`851`	`+ * permission check is needed because the user is reading inside the`
	`852`	`+ * data dir.`
`852`	`853`	`*/`
`853`		`-puts(GetConfigOption(output_config_variable, false, false));`
	`854`	`+constchar*config_val=GetConfigOption(output_config_variable,`
	`855`	`+ false, false);`
	`856`	`+`
	`857`	`+puts(config_val ?config_val :"(null)");`
`854`	`858`	`ExitPostmaster(0);`
`855`	`859`	`}`
`856`	`860`

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!

Commit29987b2

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/postmaster.c`

0 commit comments