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

Fixes crash when removing unfulfilled during writebehind operation

Browse source 
Encountered this morning -- list operation had unfulfilled emails
waiting for network operations but folder normalization determined
they were missing and used a writebehind to remove them from the
operation, but the loop to remove them explodes (can't do a remove
within a foreach).  This loop solves that problem.
This commit is contained in:
Jim Nelson 2013-08-12 12:52:45 -07:00
parent 2aa63900b4
commit 0df2c1fa7c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
View file

@ -95,8 +95,18 @@ private abstract class Geary.ImapEngine.AbstractListEmail : Geary.ImapEngine.Sen
}
// remove from unfulfilled list, as there's nothing to fetch from the server
foreach (Geary.Email.Field field in unfulfilled.get_keys())
unfulfilled.remove(field, id);
// this funky little loop ensures that all mentions of the EmailIdentifier in
// the unfulfilled MultiMap are removed, but must restart loop because removing
// within a foreach invalidates the Iterator
bool removed = false;
do {
removed = false;
foreach (Geary.Email.Field field in unfulfilled.get_keys()) {
removed = unfulfilled.remove(field, id);
if (removed)
break;
}
} while (removed);
return true;