Add missing bad-PGconn guards in libpq entry points.

tglsfdc · tglsfdc · commit d63a69157d18 · 2022-08-15T15:40:07.000-04:00
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
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -3829,6 +3829,8 @@ PQsetnonblocking(PGconn *conn, int arg)
 int
 PQisnonblocking(const PGconn *conn)
 {
+	if (!conn || conn->status == CONNECTION_BAD)
+		return false;
 	return pqIsnonblocking(conn);
 }
 
@@ -3848,6 +3850,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
@@ -1806,7 +1806,7 @@ my_SSL_set_fd(PGconn *conn, int fd)
 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"));

Original file line number	Diff line number	Diff line change
`@@ -3829,6 +3829,8 @@ PQsetnonblocking(PGconn *conn, int arg)`
`3829`	`3829`	`int`
`3830`	`3830`	`PQisnonblocking(const PGconn *conn)`
`3831`	`3831`	`{`
	`3832`	`+ if (!conn \|\| conn->status == CONNECTION_BAD)`
	`3833`	`+ return false;`
`3832`	`3834`	`return pqIsnonblocking(conn);`
`3833`	`3835`	`}`
`3834`	`3836`
`@@ -3848,6 +3850,8 @@ PQisthreadsafe(void)`
`3848`	`3850`	`int`
`3849`	`3851`	`PQflush(PGconn *conn)`
`3850`	`3852`	`{`
	`3853`	`+ if (!conn \|\| conn->status == CONNECTION_BAD)`
	`3854`	`+ return -1;`
`3851`	`3855`	`return pqFlush(conn);`
`3852`	`3856`	`}`
`3853`	`3857`
Original file line number	Diff line number	Diff line change
`@@ -1806,7 +1806,7 @@ my_SSL_set_fd(PGconn *conn, int fd)`
`1806`	`1806`	`int`
`1807`	`1807`	`PQdefaultSSLKeyPassHook_OpenSSL(char buf, int size, PGconn conn)`
`1808`	`1808`	`{`
`1809`		`- if (conn->sslpassword)`
	`1809`	`+ if (conn && conn->sslpassword)`
`1810`	`1810`	`{`
`1811`	`1811`	`if (strlen(conn->sslpassword) + 1 > size)`
`1812`	`1812`	`fprintf(stderr, libpq_gettext("WARNING: sslpassword truncated\n"));`