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

tglsfdc · tglsfdc · commit e41b8a0fddde · 2000-12-31T18:23:21.000Z
diff --git 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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.157 2000/12/31 18:15:58 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.158 2000/12/31 18:23:21 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -861,7 +861,11 @@ connectDBStart(PGconn *conn)`
`861`	`861`	`conn->raddr.sa.sa_family = family;`
`862`	`862`
`863`	`863`	`/* Set port number */`
`864`		`- portno = atoi(conn->pgport);`
	`864`	`+ if (conn->pgport != NULL && conn->pgport[0] != '\0')`
	`865`	`+ portno = atoi(conn->pgport);`
	`866`	`+ else`
	`867`	`+ portno = DEF_PGPORT;`
	`868`	`+`
`865`	`869`	`if (family == AF_INET)`
`866`	`870`	`{`
`867`	`871`	`conn->raddr.in.sin_port = htons((unsigned short) (portno));`
`@@ -875,7 +879,6 @@ connectDBStart(PGconn *conn)`
`875`	`879`	`}`
`876`	`880`	`#endif`
`877`	`881`
`878`		`-`
`879`	`882`	`/* Open a socket */`
`880`	`883`	`if ((conn->sock = socket(family, SOCK_STREAM, 0)) < 0)`
`881`	`884`	`{`