Skip to content

Commit 9dcd1aa

Browse files
committed
Fix PQport to never return NULL unless the connection is NULL.
This is the documented behavior, and it worked that way before v10. However, addition of the connhost[] array created cases where conn->connhost[conn->whichhost].port is NULL. The rest of libpq is careful to substitute DEF_PGPORT[_STR] for a null or empty port string, but we failed to do so here, leading to possibly returning NULL. As of v18 that causes psql's \conninfo command to segfault. Older psql versions avoid that, but it's pretty likely that other clients have trouble with this, so we'd better back-patch the fix. In stable branches, just revert to our historical behavior of returning an empty string when there was no user-given port specification. However, it seems substantially more useful and indeed more correct to hand back DEF_PGPORT_STR in such cases, so let's make v18 and master do that. Author: Daniele Varrazzo <daniele.varrazzo@gmail.com> Reviewed-by: Laurenz Albe <laurenz.albe@cybertec.at> Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/CA+mi_8YTS8WPZPO0PAb2aaGLwHuQ0DEQRF0ZMnvWss4y9FwDYQ@mail.gmail.com Backpatch-through: 13
1 parent 43cd859 commit 9dcd1aa

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/interfaces/libpq/fe-connect.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6646,7 +6646,9 @@ PQport(const PGconn *conn)
66466646
if (!conn)
66476647
return NULL;
66486648

6649-
if (conn->connhost != NULL)
6649+
if (conn->connhost != NULL &&
6650+
conn->connhost[conn->whichhost].port != NULL &&
6651+
conn->connhost[conn->whichhost].port[0] != '\0')
66506652
return conn->connhost[conn->whichhost].port;
66516653

66526654
return "";

src/interfaces/libpq/libpq-int.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ typedef struct pg_conn_host
311311
pg_conn_host_type type; /* type of host address */
312312
char *host; /* host name or socket path */
313313
char *hostaddr; /* host numeric IP address */
314-
char *port; /* port number (always provided) */
314+
char *port; /* port number (if NULL or empty, use
315+
* DEF_PGPORT[_STR]) */
315316
char *password; /* password for this host, read from the
316317
* password file; NULL if not sought or not
317318
* found in password file. */

0 commit comments

Comments
 (0)