Commit48a2cd3

committed

psql: fix startup crash caused by PSQLRC containing a tilde

'strdup' the PSQLRC environment variable value before calling a routinethat might free() it.Backpatch to 9.2, where the bug first appeared.

1 parentbf2b0a1 commit48a2cd3Copy full SHA for 48a2cd3

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1645,11 +1645,11 @@ session_username(void)`
`1645`	`1645`	`* substitute '~' with HOME or '~username' with username's home dir`
`1646`	`1646`	`*`
`1647`	`1647`	`*/`
`1648`		`-char*`
	`1648`	`+void`
`1649`	`1649`	`expand_tilde(char**filename)`
`1650`	`1650`	`{`
`1651`	`1651`	`if (!filename\|\| !(*filename))`
`1652`		`-returnNULL;`
	`1652`	`+return;`
`1653`	`1653`
`1654`	`1654`	`/*`
`1655`	`1655`	`* WIN32 doesn't use tilde expansion for file names. Also, it uses tilde`
`@@ -1697,5 +1697,5 @@ expand_tilde(char **filename)`
`1697`	`1697`	`}`
`1698`	`1698`	`#endif`
`1699`	`1699`
`1700`		`-return*filename;`
	`1700`	`+return;`
`1701`	`1701`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ extern bool is_superuser(void);`
`44`	`44`	`externboolstandard_strings(void);`
`45`	`45`	`externconstchar*session_username(void);`
`46`	`46`
`47`		`-externcharexpand_tilde(char*filename);`
	`47`	`+externvoidexpand_tilde(char**filename);`
`48`	`48`
`49`	`49`	`#endif/* COMMON_H */`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -610,20 +610,21 @@ process_psqlrc(char *argv0)`
`610`	`610`	`charrc_file[MAXPGPATH];`
`611`	`611`	`charmy_exec_path[MAXPGPATH];`
`612`	`612`	`charetc_path[MAXPGPATH];`
`613`		`-char*envrc;`
	`613`	`+char*envrc=getenv("PSQLRC");`
`614`	`614`
`615`	`615`	`find_my_exec(argv0,my_exec_path);`
`616`	`616`	`get_etc_path(my_exec_path,etc_path);`
`617`	`617`
`618`	`618`	`snprintf(rc_file,MAXPGPATH,"%s/%s",etc_path,SYSPSQLRC);`
`619`	`619`	`process_psqlrc_file(rc_file);`
`620`	`620`
`621`		`-envrc=getenv("PSQLRC");`
`622`		`-`
`623`	`621`	`if (envrc!=NULL&&strlen(envrc)>0)`
`624`	`622`	`{`
`625`		`-expand_tilde(&envrc);`
`626`		`-process_psqlrc_file(envrc);`
	`623`	`+/* might need to free() this */`
	`624`	`+char*envrc_alloc=pstrdup(envrc);`
	`625`	`+`
	`626`	`+expand_tilde(&envrc_alloc);`
	`627`	`+process_psqlrc_file(envrc_alloc);`
`627`	`628`	`}`
`628`	`629`	`elseif (get_home_path(home))`
`629`	`630`	`{`

Comments

(0)