From 09f876612c1cca58828552c706dcf7335b87210e Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:18:00 +0000
Subject: [PATCH] Fix obvious NULL pointer dereference from r310350.

---
 usr.sbin/syslogd/syslogd.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index ce88138b8ddd..1495bfbbb63c 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -792,14 +792,13 @@ socklist_recv_sock(struct socklist *sl)
 	} else {
 		hname = cvthname(sa);
 		unmapped(sa);
-		if (validate(sa, hname) == 0)
-			hname = NULL;
+		if (validate(sa, hname) == 0) {
+			dprintf("Message from %s was ignored.", hname);
+			return (-1);
+		}
 		date = RemoteAddDate ? ADDDATE : 0;
 	}
-	if (hname != NULL)
-		printline(hname, line, date);
-	else
-		dprintf("Invalid msg from %s was ignored.", hname);
+	printline(hname, line, date);
 
 	return (0);
 }