Return the libpq default port when blank in conninfo

cbandy · cbandy · commit 68d40c5de275 · 2022-11-11T20:47:00.000-06:00
PQport may return null or empty string when the same is set in
connection options. Internally, libpq falls back to its configured
default any time it reads these.
diff --git a/ext/pg_connection.c b/ext/pg_connection.c
@@ -702,7 +702,10 @@ static VALUE
 pgconn_port(VALUE self)
 {
 	char* port = PQport(pg_get_pgconn(self));
-	return INT2NUM(atoi(port));
+	if (!port || port[0] == '\0')
+		return INT2NUM(DEF_PGPORT);
+	else
+		return INT2NUM(atoi(port));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,10 @@ static VALUE`
`702`	`702`	`pgconn_port(VALUE self)`
`703`	`703`	`{`
`704`	`704`	`char* port = PQport(pg_get_pgconn(self));`
`705`		`- return INT2NUM(atoi(port));`
	`705`	`+ if (!port \|\| port[0] == '\0')`
	`706`	`+ return INT2NUM(DEF_PGPORT);`
	`707`	`+ else`
	`708`	`+ return INT2NUM(atoi(port));`
`706`	`709`	`}`
`707`	`710`
`708`	`711`	`/*`