Skip to content

Fix issue: "imap_response_buffer" is not correct if "MAILIMAP_ERROR_PARSE" happens #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zhixin-Lu wants to merge 2 commits into
base: release
Choose a base branch
from
Open

Fix issue: "imap_response_buffer" is not correct if "MAILIMAP_ERROR_PARSE" happens #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dee253
Fix issue: "imap_response_buffer" is not correct if "MAILIMAP_ERROR_P…
Zhixin-Lu Mar 28, 2023
8acc2ef
Return the original error code instead of "MAILIMAP_ERROR_PARSE" If "…
Zhixin-Lu Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/low-level/imap/mailimap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,6 +2523,8 @@ int mailimap_parse_response(mailimap * session,

mailimap_parser_context_free(parser_ctx);

mmap_string_assign(session->imap_response_buffer, ""); // clear imap_response_buffer of previous command first

if (r != MAILIMAP_NO_ERROR)
return r;

Expand Down
4 changes: 3 additions & 1 deletion src/low-level/imap/mailimap_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7643,6 +7643,7 @@ mailimap_message_data_parse_progress(mailstream * fd, MMAPString * buffer, struc
r = mailimap_msg_att_parse_progress(fd, buffer, parser_ctx, &cur_token, &msg_att,
progr_rate, progr_fun, body_progr_fun, items_progr_fun, context, msg_att_handler, msg_att_context);
if (r != MAILIMAP_NO_ERROR) {
int orig_r = r;
// Recover from parser error
char * tmp_char = buffer->str + cur_token;
int step = 0;
Expand Down Expand Up @@ -7714,7 +7715,8 @@ mailimap_message_data_parse_progress(mailstream * fd, MMAPString * buffer, struc
type = MAILIMAP_MESSAGE_DATA_ERROR;
} else {
// Unknow error
res = MAILIMAP_ERROR_PARSE;
// res = MAILIMAP_ERROR_PARSE;
res = orig_r;
goto err;
}
} else {
Expand Down