diff options
| -rw-r--r-- | epan/dfilter/scanner.l | 2 | ||||
| -rw-r--r-- | test/suite_dfilter/group_syntax.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 8a1351f205..e1d428c032 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -143,7 +143,7 @@ hyphen-bytes {hex2}(-{hex2})+ %% -[[:blank:]\n]+ { +[[:blank:]\n\r]+ { update_location(yyextra, yytext); } diff --git a/test/suite_dfilter/group_syntax.py b/test/suite_dfilter/group_syntax.py index 235c57468b..9b2d6cadc4 100644 --- a/test/suite_dfilter/group_syntax.py +++ b/test/suite_dfilter/group_syntax.py @@ -124,6 +124,10 @@ class case_syntax(unittest.TestCase): dfilter = "icmp and ((icmp.type > 0 and icmp.type < 8) or icmp.type > 8)" checkDFilterSucceed(dfilter) + def test_whitespace(self, checkDFilterSucceed): + dfilter = '\ttcp.stream \r\n== 1' + checkDFilterSucceed(dfilter) + @fixtures.uses_fixtures class case_equality(unittest.TestCase): trace_file = "sip.pcapng" |