From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 31 Dec 2000 18:23:21 +0000 (+0000)
Subject: On further thought, we need a defense against empty PGPORT here too.
X-Git-Tag: REL7_1_BETA2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e41b8a0fddde6f3c133a5ba2a2bedb7b3cacde09;p=postgresql

On further thought, we need a defense against empty PGPORT here too.
---

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 059388bcf3..2d5eac6816 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.157 2000/12/31 18:15:58 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.158 2000/12/31 18:23:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -861,7 +861,11 @@ connectDBStart(PGconn *conn)
 	conn->raddr.sa.sa_family = family;
 
 	/* Set port number */
-	portno = atoi(conn->pgport);
+	if (conn->pgport != NULL && conn->pgport[0] != '\0')
+		portno = atoi(conn->pgport);
+	else
+		portno = DEF_PGPORT;
+
 	if (family == AF_INET)
 	{
 		conn->raddr.in.sin_port = htons((unsigned short) (portno));
@@ -875,7 +879,6 @@ connectDBStart(PGconn *conn)
 	}
 #endif
 
-
 	/* Open a socket */
 	if ((conn->sock = socket(family, SOCK_STREAM, 0)) < 0)
 	{