mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-02-23 19:39:53 +08:00
Add missing bad-PGconn guards in libpq entry points.
There's a convention that externally-visible libpq functions should check for a NULL PGconn pointer, and fail gracefully instead of crashing. PQflush() and PQisnonblocking() didn't get that memo though. Also add a similar check to PQdefaultSSLKeyPassHook_OpenSSL; while it's not clear that ordinary usage could reach that with a null conn pointer, it's cheap enough to check, so let's be consistent. Daniele Varrazzo and Tom Lane Discussion: https://postgr.es/m/CA+mi_8Zm_mVVyW1iNFgyMd9Oh0Nv8-F+7Y3-BqwMgTMHuo_h2Q@mail.gmail.com
This commit is contained in:
parent
a5d2337005
commit
ef9f35964d
@ -3922,6 +3922,8 @@ PQsetnonblocking(PGconn *conn, int arg)
|
||||
int
|
||||
PQisnonblocking(const PGconn *conn)
|
||||
{
|
||||
if (!conn || conn->status == CONNECTION_BAD)
|
||||
return false;
|
||||
return pqIsnonblocking(conn);
|
||||
}
|
||||
|
||||
@ -3941,6 +3943,8 @@ PQisthreadsafe(void)
|
||||
int
|
||||
PQflush(PGconn *conn)
|
||||
{
|
||||
if (!conn || conn->status == CONNECTION_BAD)
|
||||
return -1;
|
||||
return pqFlush(conn);
|
||||
}
|
||||
|
||||
|
@ -1938,7 +1938,7 @@ err:
|
||||
int
|
||||
PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn)
|
||||
{
|
||||
if (conn->sslpassword)
|
||||
if (conn && conn->sslpassword)
|
||||
{
|
||||
if (strlen(conn->sslpassword) + 1 > size)
|
||||
fprintf(stderr, libpq_gettext("WARNING: sslpassword truncated\n"));
|
||||
|
Loading…
Reference in New Issue
Block a user