diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-05-25 22:27:00 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-05-25 22:27:00 +0000 |
| commit | a34ed6fcffef2c2ba625373b4729f0e2f292cd33 (patch) | |
| tree | 2acfa51156b4eba5a07ec5cdf5a0455fae219fcd /text2pcap-scanner.l | |
| parent | a07fd7f50d7710039f2d7c16ac2478abb7868758 (diff) | |
Handle lines ending in \r\n.
Fixes Bug #4780
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4780
svn path=/trunk/; revision=32956
Diffstat (limited to 'text2pcap-scanner.l')
| -rw-r--r-- | text2pcap-scanner.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l index ed81b23c8f..b47edadc3f 100644 --- a/text2pcap-scanner.l +++ b/text2pcap-scanner.l @@ -61,9 +61,9 @@ hexdigit [0-9A-Fa-f] directive #TEXT2PCAP.* comment #[^W].* byte [0-9A-Fa-f][0-9A-Fa-f][ \t] -byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n +byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n offset [0-9A-Fa-f]+[: \t] -offset_eol [0-9A-Fa-f]+\n +offset_eol [0-9A-Fa-f]+\r?\n text [^ \n\t]+ mailfwd > eol \r?\n\r? |