summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-03-06 18:20:02 +0000
committerDamien Miller <djm@mindrot.org>2020-03-13 13:13:30 +1100
commit31f1ee54968ad84eb32375e4412e0318766b586b (patch)
treeac890db73f343ae1c83cd814f120aef25de4c1a9 /ssh.c
parenta6134b02b5264b2611c8beae98bb392329452bba (diff)
upstream: initialize cname in case ai_canonname is NULL or too
long; ok djm OpenBSD-Commit-ID: c27984636fdb1035d1642283664193e91aab6e37
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index a983a108..9713b61e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.520 2020/02/18 08:49:49 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.521 2020/03/06 18:20:02 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -248,6 +248,8 @@ resolve_host(const char *name, int port, int logerr, char *cname, size_t clen)
if (port <= 0)
port = default_ssh_port();
+ if (cname != NULL)
+ *cname = '\0';
snprintf(strport, sizeof strport, "%d", port);
memset(&hints, 0, sizeof(hints));
@@ -477,7 +479,6 @@ resolve_canonicalize(char **hostp, int port)
}
/* Attempt each supplied suffix */
for (i = 0; i < options.num_canonical_domains; i++) {
- *newname = '\0';
xasprintf(&fullhost, "%s.%s.", *hostp,
options.canonical_domains[i]);
debug3("%s: attempting \"%s\" => \"%s\"", __func__,