From: Victor Julien <victor@inliniac.net>
Date: Mon, 19 Feb 2018 17:24:14 +0000 (+0100)
Subject: rust/dns: fix nom verbose error mode
X-Git-Tag: suricata-4.1.0-beta1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73fac478a25777fddc6e78dcf868585a8458672f;p=thirdparty%2Fsuricata.git

rust/dns: fix nom verbose error mode
---

diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs
index 9159a84437..faf0fe5660 100644
--- a/rust/src/dns/parser.rs
+++ b/rust/src/dns/parser.rs
@@ -77,7 +77,7 @@ pub fn dns_parse_name<'a, 'b>(start: &'b [u8],
                 }
                 _ => {
                     return nom::IResult::Error(
-                        error_position!(nom::ErrorKind::OctDigit, input));
+                        error_position!(nom::ErrorKind::OctDigit, pos));
                 }
             }
         } else if len & 0b1100_0000 == 0b1100_0000 {
@@ -86,7 +86,7 @@ pub fn dns_parse_name<'a, 'b>(start: &'b [u8],
                     let offset = leader & 0x3fff;
                     if offset as usize > message.len() {
                         return nom::IResult::Error(
-                            error_position!(nom::ErrorKind::OctDigit, input));
+                            error_position!(nom::ErrorKind::OctDigit, pos));
                     }
                     pos = &message[offset as usize..];
                     if pivot == start {
@@ -95,19 +95,19 @@ pub fn dns_parse_name<'a, 'b>(start: &'b [u8],
                 }
                 _ => {
                     return nom::IResult::Error(
-                        error_position!(nom::ErrorKind::OctDigit, input));
+                        error_position!(nom::ErrorKind::OctDigit, pos));
                 }
             }
         } else {
             return nom::IResult::Error(
-                error_position!(nom::ErrorKind::OctDigit, input));
+                error_position!(nom::ErrorKind::OctDigit, pos));
         }
 
         // Return error if we've looped a certain number of times.
         count += 1;
         if count > 255 {
             return nom::IResult::Error(
-                error_position!(nom::ErrorKind::OctDigit, input));
+                error_position!(nom::ErrorKind::OctDigit, pos));
         }
 
     }