diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 07:34:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 07:34:13 +0200 |
| commit | 2b75ccbe54dd67af7911f8a131b08c757e84d744 (patch) | |
| tree | 97871e06b0fcf16fa413b0011f2b7ed6b776cb9c | |
| parent | b93ed468a0e0c0c452ec4ddd6f737002ccd48726 (diff) | |
| download | rsyslog-2b75ccbe54dd67af7911f8a131b08c757e84d744.tar.gz rsyslog-2b75ccbe54dd67af7911f8a131b08c757e84d744.tar.bz2 rsyslog-2b75ccbe54dd67af7911f8a131b08c757e84d744.zip | |
bugfix: comments inside objects (e.g. action()) were not properly handled
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | grammar/lexer.l | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 6.4.3 [V6-STABLE] 2012-??-?? +- bugfix: comments inside objects (e.g. action()) were not properly handled - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. Thanks to Milan Bartos for alerting us and a patch! diff --git a/grammar/lexer.l b/grammar/lexer.l index f03659c3..065ea056 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -182,6 +182,7 @@ int fileno(FILE *stream); yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2); return VALUE; } "/*" { preCommentState = YY_START; BEGIN COMMENT; } +<INOBJ>"/*" { preCommentState = YY_START; BEGIN COMMENT; } <EXPR>"/*" { preCommentState = YY_START; BEGIN COMMENT; } <COMMENT>"*/" { BEGIN preCommentState; } <COMMENT>([^*]|\n)+|. |