From: Sascha Steinbiss Date: Tue, 3 Nov 2020 18:52:10 +0000 (+0100) Subject: dns: use rest() for NULL parsing X-Git-Tag: suricata-7.0.0-beta1~1950 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4556c94271a107e4a4e7b62e109b021bb67f6e8;p=thirdparty%2Fsuricata.git dns: use rest() for NULL parsing --- diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs index 3074484f61..c0aef4b42b 100644 --- a/rust/src/dns/parser.rs +++ b/rust/src/dns/parser.rs @@ -346,13 +346,9 @@ fn dns_parse_rdata_txt<'a>(input: &'a [u8]) ) } -fn dns_parse_rdata_null<'a>(input: &'a [u8]) - -> IResult<&'a [u8], DNSRData> { - do_parse!( - input, - data: take!(input.len()) >> - (DNSRData::NULL(data.to_vec())) - ) + +fn dns_parse_rdata_null<'a>(input: &'a [u8]) -> IResult<&'a [u8], DNSRData> { + rest(input).map(|(input, data)| (input, DNSRData::NULL(data.to_vec()))) } fn dns_parse_rdata_sshfp<'a>(input: &'a [u8])