diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-08-15 15:40:07 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-08-15 15:40:07 -0400 |
| commit | ef9f35964dea10d522fdb3aadef3e92f50b03d1c (patch) | |
| tree | eb6c61c19efc0f91147460baedcb7e84e674abd5 | |
| parent | a5d2337005820a2227d2d9970cdd5a7ac67bfc75 (diff) | |
| download | postgresql-ef9f35964dea10d522fdb3aadef3e92f50b03d1c.tar.gz postgresql-ef9f35964dea10d522fdb3aadef3e92f50b03d1c.zip | |
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
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 0e4c77420c2..23ceff75024 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -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); } diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 8117cbd40f1..3cc75380e02 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -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")); |