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 | e37e9a65517552e79614a1c81c8aff216d033e59 (patch) | |
| tree | b1465c039b81d8e8c6bdeaba6d6cf2a3e55fea0e | |
| parent | bcf7eb99bbf15954a92df0a4405713d561402be2 (diff) | |
| download | postgresql-e37e9a65517552e79614a1c81c8aff216d033e59.tar.gz postgresql-e37e9a65517552e79614a1c81c8aff216d033e59.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 9c465b1f967..feb5085ce57 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -3267,6 +3267,8 @@ PQsetnonblocking(PGconn *conn, int arg) int PQisnonblocking(const PGconn *conn) { + if (!conn || conn->status == CONNECTION_BAD) + return false; return pqIsnonblocking(conn); } @@ -3286,6 +3288,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 196737563df..26615a1aa42 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1747,7 +1747,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")); |