svn commit: r275938 - stable/10/usr.sbin/syslogd

[Andrey V. Elsukov]

Author: ae
Date: Fri Dec 19 13:22:02 2014
New Revision: 275938
URL: https://svnweb.freebsd.org/changeset/base/275938

Log:
  MFC r275729:
    Increase the buffer size to keep the list of programm names when
    parsing programm specification. It is safe to not check out of bounds
    access, because !isprint(p[i]) check will stop reading, when '\0'
    character will be read from the input string.
  
  Sponsored by:	Yandex LLC

Modified:
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/10/usr.sbin/syslogd/syslogd.c	Fri Dec 19 13:07:36 2014	(r275937)
+++ stable/10/usr.sbin/syslogd/syslogd.c	Fri Dec 19 13:22:02 2014	(r275938)
@@ -1542,7 +1542,7 @@ init(int signo)
 	struct filed *f, *next, **nextp;
 	char *p;
 	char cline[LINE_MAX];
- 	char prog[NAME_MAX+1];
+ 	char prog[LINE_MAX];
 	char host[MAXHOSTNAMELEN];
 	char oldLocalHostName[MAXHOSTNAMELEN];
 	char hostMsg[2*MAXHOSTNAMELEN+40];
@@ -1664,7 +1664,7 @@ init(int signo)
 				(void)strlcpy(prog, "*", sizeof(prog));
 				continue;
 			}
-			for (i = 0; i < NAME_MAX; i++) {
+			for (i = 0; i < LINE_MAX - 1; i++) {
 				if (!isprint(p[i]) || isspace(p[i]))
 					break;
 				prog[i] = p[i];