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

bmomjian · bmomjian · commit a4c8f14364c2 · 2014-03-20T11:48:31.000-04:00
Previously user name memory allocation failures were ignored and the
default user name set to NULL.
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -741,16 +741,18 @@ pg_fe_getauthname(void)
 	 */
 	pglock_thread();
 
-	if (!name)
-	{
+	/*
+	 *	We document PQconndefaults() to return NULL for a memory allocation
+	 *	failure.  We don't have an API to return a user name lookup failure,
+	 *	so we just assume it always succeeds.
+	 */
 #ifdef WIN32
-		if (GetUserName(username, &namesize))
-			name = username;
+	if (GetUserName(username, &namesize))
+		name = username;
 #else
-		if (pqGetpwuid(geteuid(), &pwdstr, pwdbuf, sizeof(pwdbuf), &pw) == 0)
-			name = pw->pw_name;
+	if (pqGetpwuid(geteuid(), &pwdstr, pwdbuf, sizeof(pwdbuf), &pw) == 0)
+		name = pw->pw_name;
 #endif
-	}
 
 	authn = name ? strdup(name) : NULL;
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4482,6 +4482,13 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
 		if (strcmp(option->keyword, "user") == 0)
 		{
 			option->val = pg_fe_getauthname();
+			if (!option->val)
+			{
+				if (errorMessage)
+					printfPQExpBuffer(errorMessage,
+									  libpq_gettext("out of memory\n"));
+				return false;
+			}
 			continue;
 		}
 	}

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`	`}`