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 059388bcf353d43ae5dff38ffb92a5a480f47789..2d5eac6816388a26aaff4f3efc7a0f525face330 100644 (file)
--- 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)
        {