dfilter: treat carriage returns as whitespace

Fixes #18595
2022-11-03 17:31:29 +00:00 · 2022-11-03 17:31:29 +00:00 · df478a365d
parent 16afad10fb
commit df478a365d
2 changed files with 5 additions and 1 deletions
--- 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);
 }

--- 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"