From ecd3063613a44309583e553db4485cfa55df34a9 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Thu, 8 May 2025 18:34:56 +0200 Subject: [PATCH] Fix PQport to never return NULL unless the connection is NULL This is the documented behaviour, but, at the moment, if the port in the connection string is an empty string, the port is returned as NULL by this function. --- src/interfaces/libpq/fe-connect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 2f87961a71e..454d2ea3fb7 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -7074,7 +7074,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 ""; -- 2.34.1