svn commit: trunk/busybox/sysklogd

vda at busybox.net vda at busybox.net
Tue Feb 19 01:10:22 UTC 2008


Author: vda
Date: 2008-02-18 17:10:20 -0800 (Mon, 18 Feb 2008)
New Revision: 21059

Log:
syslogd: tighten up hostname handling.



Modified:
   trunk/busybox/sysklogd/syslogd.c


Changeset:
Modified: trunk/busybox/sysklogd/syslogd.c
===================================================================
--- trunk/busybox/sysklogd/syslogd.c	2008-02-19 00:38:10 UTC (rev 21058)
+++ trunk/busybox/sysklogd/syslogd.c	2008-02-19 01:10:20 UTC (rev 21059)
@@ -649,10 +649,10 @@
 
 	/* 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);




More information about the busybox-cvs mailing list