meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

Fix last header value bug

embed
Manos Pitsidianakis 2017-09-24 12:29:39 +03:00
parent ab71da5154
commit 0c3938961e
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mailbox/email/parser.rs
View File

@ -69,15 +69,17 @@ fn header_value(input: &[u8]) -> IResult<&[u8], &str> {
let input_len = input.len();
for (i, x) in input.iter().enumerate() {
if *x == b'\n' {
if (i + 1) < input_len &&
((input[i + 1] != b' ' && input[i + 1] != b'\t') || input[i + 1] == b'\n')
if (i + 1) < input_len && input[i + 1] != b' ' && input[i + 1] != b'\t'
{
return match from_utf8(&input[0..i]) {
Ok(v) => IResult::Done(&input[(i + 1)..], v),
Err(_) => IResult::Error(error_code!(ErrorKind::Custom(43))),
};
} else if i + 1 > input_len {
return IResult::Incomplete(Needed::Size(1));
} else if i + 1 == input_len {
return match from_utf8(input) {
Ok(v) => IResult::Done(&input[(i + 1)..], v),
Err(_) => IResult::Error(error_code!(ErrorKind::Custom(43))),
};
}
}
}
@ -98,8 +100,20 @@ named!(
named!(pub headers<std::vec::Vec<(&str, &str)>>,
many1!(complete!(header)));
named!(pub headers_raw<&[u8]>,
take_until1!("\n\n"));
//named!(pub headers_raw<&[u8]>,
//take_until1!("\n\n"));
pub fn headers_raw(input: &[u8]) -> IResult<&[u8], &[u8]> {
if input.is_empty() {
return IResult::Incomplete(Needed::Unknown)
}
for (i, x) in input.iter().enumerate() {
if *x == b'\n' && i + 1 < input.len() && input[i+1] == b'\n' {
return IResult::Done(&input[(i + 1)..], &input[0..i+1]);
}
}
return IResult::Error(error_code!(ErrorKind::Custom(43)));
}
named!(pub body_raw<&[u8]>,
do_parse!(