]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust/dns: fix nom verbose error mode
authorVictor Julien <victor@inliniac.net>
Mon, 19 Feb 2018 17:24:14 +0000 (18:24 +0100)
committerVictor Julien <victor@inliniac.net>
Thu, 1 Mar 2018 13:43:47 +0000 (14:43 +0100)
rust/src/dns/parser.rs

index 9159a84437ccf8d8ec8499cc634f40a479db748f..faf0fe5660fd395e865ef3598e8f05299e82741a 100644 (file)
@@ -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));
         }
 
     }