database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Fix minor bugs in commit 30bf4689a96cd283af33edcdd6b7210df3f20cd8 et al.

Browse Source 
Coverity complained that the "else" added to fillPGconn() was unreachable,
which it was.  Remove the dead code.  In passing, rearrange the tests so as
not to bother trying to fetch values for options that can't be assigned.

Pre-9.3 did not have that issue, but it did have a "return" that should be
"goto oom_error" to ensure that a suitable error message gets filled in.
This commit is contained in:
Tom Lane 2014-11-30 12:20:54 -05:00
parent a1cd04cd0d
commit 7b46ef1dad
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/interfaces/libpq/fe-connect.c
View File

@ -664,7 +664,7 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
free(conn->sslmode);
conn->sslmode = strdup("require");
if (!conn->sslmode)
return false;
goto oom_error;
}
#endif
FILL_CONN_OPTION(conn->requirepeer, "requirepeer");
@ -767,7 +767,6 @@ connectOptions2(PGconn *conn)
conn->pgpass = strdup(DefaultPassword);
if (!conn->pgpass)
goto oom_error;
}
else
conn->dot_pgpass_used = true;