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: http://postgr.es/m/CA+mi_8YTS8WPZPO0PAb2aaGLwHuQ0DEQRF0ZMnvWss4y9FwDYQ@mail.gmail.com
Backpatch-through: 13

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index be028d628b1b32ee83af1d06dc1563d4e400504c..9b781c35002ae4afe422783654533a43271526ec 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -6646,7 +6646,9 @@ PQport(const PGconn *conn)
    if (!conn)
        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 "";

diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 668a5c874982c2997cd35de4d9e99efd418e495f..4b06548653006241b7e233372b93c028b2ec4a71 100644 (file)
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -311,7 +311,8 @@ typedef struct pg_conn_host
    pg_conn_host_type type;     /* type of host address */
    char       *host;           /* host name or socket path */
    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
                                 * password file; NULL if not sought or not
                                 * found in password file. */