upstream commit

Check l->hosts before dereferencing; fixes potential null
pointer deref. ok djm@

Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301

Origin: https://anongit.mindrot.org/openssh.git/commit/?id=18501151cf272a15b5f2c5e777f2e0933633c513
Last-Update: 2017-03-16

Patch-Name: ssh-keygen-null-deref.patch

1 files changed, 1 insertions, 1 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0833ee61d..a7c1e80b9 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1082,7 +1082,7 @@ known_hosts_hash(struct hostkey_foreach_line *l, void *_ctx)
         struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx;
         char *hashed, *cp, *hosts, *ohosts;
         int has_wild = l->hosts && strcspn(l->hosts, "*?!") != strlen(l->hosts);
-        int was_hashed = l->hosts[0] == HASH_DELIM;
+        int was_hashed = l->hosts && l->hosts[0] == HASH_DELIM;
 
         switch (l->status) {
         case HKF_STATUS_OK: