summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--grammar/lexer.l1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bc3e7750..acaa0ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)+|.