syslogd: tighten up hostname handling.

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index dc5e6250a2b7e6fb514311438ca1d6a671a8a297..bed18168cb825b7fd4b3d50bc572091389e12bca 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -649,10 +649,10 @@ int syslogd_main(int argc, char **argv)
 
        /* Store away localhost's name before the fork */
        gethostname(G.localHostName, sizeof(G.localHostName));
-       p = strchr(G.localHostName, '.');
-       if (p) {
-               *p = '\0';
-       }
+       /* "It is unspecified whether the truncated hostname
+        * will be null-terminated". Idiots! */
+       G.localHostName[sizeof(G.localHostName) - 1] = '\0';
+       *strchrnul(G.localHostName, '.') = '\0';
 
        if (!(option_mask32 & OPT_nofork)) {
                bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);