database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-20 05:03:10 +03:00
Code Activity

Fix PQport to never return NULL unless the connection is NULL.

Browse Source 
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
This commit is contained in:
Tom Lane
2025-07-17 12:46:38 -04:00
parent 43cd859627
commit 9dcd1aa815
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-connect.c
View File

@ -6646,7 +6646,9 @@ PQport(const PGconn *conn)
if (!conn) if (!conn)
return NULL; return NULL;
if (conn->connhost != NULL) if (conn->connhost != NULL &&
conn->connhost[conn->whichhost].port != NULL &&
conn->connhost[conn->whichhost].port[0] != '\0')
return conn->connhost[conn->whichhost].port; return conn->connhost[conn->whichhost].port;
return ""; return "";

3
src/interfaces/libpq/libpq-int.h
View File

@ -311,7 +311,8 @@ typedef struct pg_conn_host
pg_conn_host_type type; /* type of host address */ pg_conn_host_type type; /* type of host address */
char *host; /* host name or socket path */ char *host; /* host name or socket path */
char *hostaddr; /* host numeric IP address */ char *hostaddr; /* host numeric IP address */
char *port; /* port number (always provided) */ char *port; /* port number (if NULL or empty, use
* DEF_PGPORT[_STR]) */
char *password; /* password for this host, read from the char *password; /* password for this host, read from the
* password file; NULL if not sought or not * password file; NULL if not sought or not
* found in password file. */ * found in password file. */