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

imap: show reason for error on invalid uid fetch response

memfd
Manos Pitsidianakis 2020-06-22 17:25:49 +03:00
parent 7d359624fe
commit 3703ae762e
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
melib/src/backends/imap/protocol_parser.rs
View File

@ -661,17 +661,30 @@ pub fn uid_fetch_responses(mut input: &str) -> ImapParseResult<Vec<UidFetchRespo
let mut ret = Vec::new();
let mut alert: Option<Alert> = None;
while let Ok((rest, el, el_alert)) = uid_fetch_response(input) {
if let Some(el_alert) = el_alert {
match &mut alert {
Some(Alert(ref mut alert)) => {
alert.extend(el_alert.0.chars());
while let next_response = uid_fetch_response(input) {
match next_response {
Ok((rest, el, el_alert)) => {
if let Some(el_alert) = el_alert {
match &mut alert {
Some(Alert(ref mut alert)) => {
alert.extend(el_alert.0.chars());
}
a @ None => *a = Some(el_alert),
}
}
a @ None => *a = Some(el_alert),
input = rest;
ret.push(el);
if !input.starts_with("* ") {
break;
}
}
Err(err) => {
return Err(MeliError::new(format!(
"Unexpected input while parsing UID FETCH responses: `{:.40}`, {}",
input, err
)));
}
}
input = rest;
ret.push(el);
}
if !input.is_empty() && ret.is_empty() {