summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-15 17:07:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-15 17:07:09 +0200
commit162b409c2c8d3e33e6dbc7543862a9b82baaa44d (patch)
tree345def295df596cb3c52b12b2d70b2dcc48793bb
parent84ca2c443680de2c7e98f27972fb6300a025d62d (diff)
downloadrsyslog-162b409c2c8d3e33e6dbc7543862a9b82baaa44d.tar.gz
rsyslog-162b409c2c8d3e33e6dbc7543862a9b82baaa44d.tar.xz
rsyslog-162b409c2c8d3e33e6dbc7543862a9b82baaa44d.zip
bugfix: misaddressing in config handler
In theory, can cause segfault, in practice this is extremely unlikely Thanks to Marcin for alertig me.
-rw-r--r--ChangeLog3
-rw-r--r--runtime/rsconf.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ae5dffc..be11c02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 6.3.4 [DEVEL] (rgerhards), 2011-07-??
+- bugfix: misaddressing in config handler
+ In theory, can cause segfault, in practice this is extremely unlikely
+ Thanks to Marcin for alertig me.
---------------------------------------------------------------------------
Version 6.3.3 [DEVEL] (rgerhards), 2011-07-13
- rsyslog.conf format: now parsed by RainerScript parser
diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index 0ccf2d57..f369dadf 100644
--- a/runtime/rsconf.c
+++ b/runtime/rsconf.c
@@ -339,7 +339,7 @@ parser_errmsg(char *fmt, ...)
va_start(ap, fmt);
if(vsnprintf(errBuf, sizeof(errBuf), fmt, ap) == sizeof(errBuf))
- errBuf[1024] = '\0';
+ errBuf[1023] = '\0';
errmsg.LogError(0, RS_RET_CONF_PARSE_ERROR,
"error during parsing file %s, on or before line %d: %s",
cnfcurrfn, yylineno, errBuf);