From 669678119c6cc565ff98786f3f0f92bad38e4c8d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 5 Jun 2018 10:35:42 +0200
Subject: [PATCH] knownhosts: Fix possible null pointer dereference

CID 1391447

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/knownhosts.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/knownhosts.c b/src/knownhosts.c
index 7563d273..f9aa1588 100644
--- a/src/knownhosts.c
+++ b/src/knownhosts.c
@@ -403,10 +403,12 @@ int ssh_known_hosts_parse_line(const char *hostname,
     p = strtok(NULL, " ");
     if (p != NULL) {
         p = strstr(line, p);
-        e->comment = strdup(p);
-        if (e->comment == NULL) {
-            rc = SSH_ERROR;
-            goto out;
+        if (p != NULL) {
+            e->comment = strdup(p);
+            if (e->comment == NULL) {
+                rc = SSH_ERROR;
+                goto out;
+            }
         }
     }