aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2017-07-10 15:29:36 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2017-07-10 15:29:36 +0300
commit4d06f1f858d0fea01a2cde74d8b831a823776355 (patch)
treede0a07bfb288fb330a62ee11d572b1ee654ae526
parent1add0b15f117769f619af12720bea2f73d4f7359 (diff)
downloadpostgresql-4d06f1f858d0fea01a2cde74d8b831a823776355.tar.gz
postgresql-4d06f1f858d0fea01a2cde74d8b831a823776355.zip
Fix check for empty hostname.
As reported by Arthur Zakirov, Gcc 7.1 complained about this with -Wpointer-compare. Discussion: https://www.postgresql.org/message-id/CAKNkYnybV_NFVacGbW=VspzAo3TwRJFNi+9iBob66YqQMZopwg@mail.gmail.com
-rw-r--r--src/interfaces/libpq/fe-connect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index e548f3f0621..5a964bf0b57 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -965,8 +965,8 @@ connectOptions2(PGconn *conn)
{
conn->status = CONNECTION_BAD;
printfPQExpBuffer(&conn->errorMessage,
- libpq_gettext("could not match %d host names to %d hostaddrs\n"),
- count_comma_separated_elems(conn->pghost), conn->nconnhost);
+ libpq_gettext("could not match %d host names to %d hostaddrs\n"),
+ count_comma_separated_elems(conn->pghost), conn->nconnhost);
return false;
}
}
@@ -1097,7 +1097,7 @@ connectOptions2(PGconn *conn)
char *pwhost = conn->connhost[i].host;
if (conn->connhost[i].type == CHT_HOST_ADDRESS &&
- conn->connhost[i].host != NULL && conn->connhost[i].host != '\0')
+ conn->connhost[i].host != NULL && conn->connhost[i].host[0] != '\0')
pwhost = conn->connhost[i].hostaddr;
conn->connhost[i].password =