summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-01-09 15:58:36 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-01-09 15:58:36 +0100
commit8a344f0ba6938591dc91a5fc2218eaa89c6fecd6 (patch)
tree674318bde3fbb809ebd291ce971828608f731ef5
parent6b1c4e423730cec57ee29b04ae973e86ea17a9d7 (diff)
downloadrsyslog-8a344f0ba6938591dc91a5fc2218eaa89c6fecd6.tar.gz
rsyslog-8a344f0ba6938591dc91a5fc2218eaa89c6fecd6.tar.bz2
rsyslog-8a344f0ba6938591dc91a5fc2218eaa89c6fecd6.zip
slightly improved config parser error messages when invalid escapes happen
-rw-r--r--ChangeLog3
-rw-r--r--grammar/lexer.l3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index df32f47e..166ca0a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
----------------------------------------------------------------------------
+Version 7.2.6 [v7-stable] 2013-01-??
+- slightly improved config parser error messages when invalid escapes happen
+----------------------------------------------------------------------------
Version 7.2.5 [v7-stable] 2013-01-08
- build system cleanup (thanks to Michael Biebl for this!)
- bugfix: omelasticsearch did not properly compile on some platforms
diff --git a/grammar/lexer.l b/grammar/lexer.l
index 63eaa8ce..b7966369 100644
--- a/grammar/lexer.l
+++ b/grammar/lexer.l
@@ -216,7 +216,8 @@ int fileno(FILE *stream);
<COMMENT>([^*]|\n)+|.
<INOBJ>#.*$ /* skip comments in input */
<INOBJ>[ \n\t]
-<INOBJ>. { dbgprintf("INOBJ: invalid char '%s'\n", yytext); }
+<INOBJ>. { parser_errmsg("invalid character '%s' - is there an invalid "
+ "escape sequence somewhere?", yytext); }
\$[a-z]+.*$ { /* see comment on $IncludeConfig above */
if(!strncasecmp(yytext, "$includeconfig ", 14)) {
yyless(14);