don't close the magic file descriptor

fix segfaults in popt when called with bogus stuff (#28140)

1 files changed, 6 insertions, 1 deletions

diff --git a/src/initlog.c b/src/initlog.c
index 32863591..5905e16c 100644
--- a/src/initlog.c
+++ b/src/initlog.c
@@ -1,4 +1,5 @@
 
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libintl.h>
@@ -179,6 +180,7 @@ int startDaemon() {
 	dup2(fd,0);
 	dup2(fd,1);
 	dup2(fd,2);
+        close(fd);
 	/* kid */
 	execlp("minilogd","minilogd",NULL);
 	perror("exec");
@@ -416,13 +418,16 @@ int processArgs(int argc, char **argv, int silent) {
     } else {
 	readConfiguration("/etc/initlog.conf");
     }
+    if (cmd) {
+	    while (isspace(*cmd)) cmd++;
+    }
     if (lpri!=-1) logpriority=lpri;
     if (lfac!=-1) logfacility=lfac;
     if (cmdevent) {
 	logEvent(cmdname,cmdevent,logstring);
     } else if (logstring) {
 	logString(cmdname,logstring);
-    } else if ( cmd ) {
+    } else if ( cmd && *cmd) {
 	return(runCommand(cmd,reexec,quiet,debug));
     } else {
         if (!silent)