summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-20 15:05:41 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-01-20 15:05:41 (GMT)
commit81fa999540740b5269a349a9e991eb506592ea75 (patch)
tree45c220e07305e073a429ae3a6eae2b7257deaff6
parent2cfcc9e9d74447cb770255d1d8cb6f3722df22ba (diff)
downloadbusybox-81fa999540740b5269a349a9e991eb506592ea75.tar.gz
busybox-81fa999540740b5269a349a9e991eb506592ea75.tar.bz2
syslogd: do not segfault on parse error when using default config. Closes 5762
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--sysklogd/syslogd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index f349f47..3fe3f53 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -429,7 +429,9 @@ static void parse_syslogdcfg(const char *file)
return;
cfgerr:
- bb_error_msg_and_die("error in '%s' at line %d", file, parser->lineno);
+ bb_error_msg_and_die("error in '%s' at line %d",
+ file ? file : "/etc/syslog.conf",
+ parser->lineno);
}
#endif