Commita4c8f14

committed

libpq: pass a memory allocation failure error up to PQconndefaults()

Previously user name memory allocation failures were ignored and thedefault user name set to NULL.

1 parentd1bdab2 commita4c8f14Copy full SHA for a4c8f14

File tree

+16

-7

lines changed

+16

-7

lines changed

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -741,16 +741,18 @@ pg_fe_getauthname(void)`
`741`	`741`	`*/`
`742`	`742`	`pglock_thread();`
`743`	`743`
`744`		`-if (!name)`
`745`		`-{`
	`744`	`+/*`
	`745`	`+ *We document PQconndefaults() to return NULL for a memory allocation`
	`746`	`+ *failure. We don't have an API to return a user name lookup failure,`
	`747`	`+ *so we just assume it always succeeds.`
	`748`	`+ */`
`746`	`749`	`#ifdefWIN32`
`747`		`-if (GetUserName(username,&namesize))`
`748`		`-name=username;`
	`750`	`+if (GetUserName(username,&namesize))`
	`751`	`+name=username;`
`749`	`752`	`#else`
`750`		`-if (pqGetpwuid(geteuid(),&pwdstr,pwdbuf,sizeof(pwdbuf),&pw)==0)`
`751`		`-name=pw->pw_name;`
	`753`	`+if (pqGetpwuid(geteuid(),&pwdstr,pwdbuf,sizeof(pwdbuf),&pw)==0)`
	`754`	`+name=pw->pw_name;`
`752`	`755`	`#endif`
`753`		`-}`
`754`	`756`
`755`	`757`	`authn=name ?strdup(name) :NULL;`
`756`	`758`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4482,6 +4482,13 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)`
`4482`	`4482`	`if (strcmp(option->keyword,"user")==0)`
`4483`	`4483`	`{`
`4484`	`4484`	`option->val=pg_fe_getauthname();`
	`4485`	`+if (!option->val)`
	`4486`	`+{`
	`4487`	`+if (errorMessage)`
	`4488`	`+printfPQExpBuffer(errorMessage,`
	`4489`	`+libpq_gettext("out of memory\n"));`
	`4490`	`+return false;`
	`4491`	`+}`
`4485`	`4492`	`continue;`
`4486`	`4493`	`}`
`4487`	`4494`	`}`

Comments

(0)