Commit39d4c76

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 parentc99e0d3 commit39d4c76Copy full SHA for 39d4c76

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
`@@ -1617,11 +1617,11 @@ session_username(void)`
`1617`	`1617`	`* substitute '~' with HOME or '~username' with username's home dir`
`1618`	`1618`	`*`
`1619`	`1619`	`*/`
`1620`		`-char*`
	`1620`	`+void`
`1621`	`1621`	`expand_tilde(char**filename)`
`1622`	`1622`	`{`
`1623`	`1623`	`if (!filename\|\| !(*filename))`
`1624`		`-returnNULL;`
	`1624`	`+return;`
`1625`	`1625`
`1626`	`1626`	`/*`
`1627`	`1627`	`* WIN32 doesn't use tilde expansion for file names. Also, it uses tilde`
`@@ -1669,5 +1669,5 @@ expand_tilde(char **filename)`
`1669`	`1669`	`}`
`1670`	`1670`	`#endif`
`1671`	`1671`
`1672`		`-return*filename;`
	`1672`	`+return;`
`1673`	`1673`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ extern bool is_superuser(void);`
`61`	`61`	`externboolstandard_strings(void);`
`62`	`62`	`externconstchar*session_username(void);`
`63`	`63`
`64`		`-externcharexpand_tilde(char*filename);`
	`64`	`+externvoidexpand_tilde(char**filename);`
`65`	`65`
`66`	`66`	`#endif/* COMMON_H */`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -591,20 +591,21 @@ process_psqlrc(char *argv0)`
`591`	`591`	`charrc_file[MAXPGPATH];`
`592`	`592`	`charmy_exec_path[MAXPGPATH];`
`593`	`593`	`charetc_path[MAXPGPATH];`
`594`		`-char*envrc;`
	`594`	`+char*envrc=getenv("PSQLRC");`
`595`	`595`
`596`	`596`	`find_my_exec(argv0,my_exec_path);`
`597`	`597`	`get_etc_path(my_exec_path,etc_path);`
`598`	`598`
`599`	`599`	`snprintf(rc_file,MAXPGPATH,"%s/%s",etc_path,SYSPSQLRC);`
`600`	`600`	`process_psqlrc_file(rc_file);`
`601`	`601`
`602`		`-envrc=getenv("PSQLRC");`
`603`		`-`
`604`	`602`	`if (envrc!=NULL&&strlen(envrc)>0)`
`605`	`603`	`{`
`606`		`-expand_tilde(&envrc);`
`607`		`-process_psqlrc_file(envrc);`
	`604`	`+/* might need to free() this */`
	`605`	`+char*envrc_alloc=pg_strdup(envrc);`
	`606`	`+`
	`607`	`+expand_tilde(&envrc_alloc);`
	`608`	`+process_psqlrc_file(envrc_alloc);`
`608`	`609`	`}`
`609`	`610`	`elseif (get_home_path(home))`
`610`	`611`	`{`

Comments

(0)