nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't crashed on FetchedData assertion: Closes #7146

Browse source 
Assertion is incorrect here because it's possible for the data
not to be returned for valid reasons -- usually a command response
failure (i.e. "NO").  Still want to log it for debugging purposes,
but don't crash when it happens.

Note that this patch also won't return the email if it doesn't
fulfill all the fields.
This commit is contained in:
Jim Nelson 2013-07-01 15:26:32 -07:00
parent 9717d77850
commit 83fbc7d131
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/engine/imap/api/imap-folder.vala
View file

@ -431,8 +431,10 @@ private class Geary.Imap.Folder : BaseObject {
partial_header_identifier, body_identifier, preview_identifier,
preview_charset_identifier);
if (!email.fields.fulfills(fields)) {
debug("%s: %s missing=%s fetched=%s", to_string(), email.id.to_string(),
message("%s: %s missing=%s fetched=%s", to_string(), email.id.to_string(),
fields.clear(email.fields).to_list_string(), fetched_data.to_string());
continue;
}
email_list.add(email);
@ -679,15 +681,13 @@ private class Geary.Imap.Folder : BaseObject {
email.set_email_properties(new Geary.Imap.EmailProperties(internaldate, rfc822_size));
// if the header was requested, convert its fields now
if (partial_header_identifier != null) {
if (!fetched_data.body_data_map.has_key(partial_header_identifier)) {
debug("[%s] No partial header identifier \"%s\" found:", to_string(),
partial_header_identifier.to_string());
foreach (FetchBodyDataIdentifier id in fetched_data.body_data_map.keys)
debug("[%s] has %s", to_string(), id.to_string());
}
assert(fetched_data.body_data_map.has_key(partial_header_identifier));
bool has_partial_header = fetched_data.body_data_map.has_key(partial_header_identifier);
if (partial_header_identifier != null && !has_partial_header) {
message("[%s] No partial header identifier \"%s\" found:", to_string(),
partial_header_identifier.to_string());
foreach (FetchBodyDataIdentifier id in fetched_data.body_data_map.keys)
message("[%s] has %s", to_string(), id.to_string());
} else if (partial_header_identifier != null && has_partial_header) {
RFC822.Header headers = new RFC822.Header(
fetched_data.body_data_map.get(partial_header_identifier));