diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-31 18:23:21 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-31 18:23:21 +0000 |
| commit | e41b8a0fddde6f3c133a5ba2a2bedb7b3cacde09 (patch) | |
| tree | 52fa6a8d5dd5b1f087e73561b957ebefb512c3c5 | |
| parent | 45f92179d921e693eaa4dc0c6b393c3368b43c31 (diff) | |
| download | postgresql-e41b8a0fddde6f3c133a5ba2a2bedb7b3cacde09.tar.gz postgresql-e41b8a0fddde6f3c133a5ba2a2bedb7b3cacde09.zip | |
On further thought, we need a defense against empty PGPORT here too.
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 059388bcf35..2d5eac68163 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) { |