]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Fix PQport to never return NULL unless the connection is NULL.
authorTom Lane <tgl@sss.pgh.pa.us>
Thu, 17 Jul 2025 16:46:38 +0000 (12:46 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Thu, 17 Jul 2025 16:46:59 +0000 (12:46 -0400)
commitd5cba774626f3c09df536aeddbf2f8c08a3cecc7
tree6c551f0052d0f4583773099204b2dfbaafe4c8c9
parentb9a89682846f0dc47fef9d80219ba8fe0d9779c7
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
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/libpq-int.h