Mercurial > dovecot > core-2.2
changeset 22013:b57e0cfd334d
lib-storage: When save is aborted, close dest_mail without crashing
Fixes:
Panic: file mail-index-transaction-update.c: line 1023 (mail_index_update_ext): assertion failed: (seq > 0 && (seq <= mail_index_view_get_messages_count(t->view) || seq <= t->last_new_seq))
Because cache was still attempted to be updated, but the mail was already
expunged from index.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Fri, 28 Apr 2017 14:35:36 +0300 |
| parents | ce5fc3bd3b40 |
| children | 1c92b6a4adfa |
| files | src/lib-storage/index/index-storage.c |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/index-storage.c Fri Apr 28 14:06:43 2017 +0300 +++ b/src/lib-storage/index/index-storage.c Fri Apr 28 14:35:36 2017 +0300 @@ -1117,6 +1117,13 @@ void index_storage_save_abort_last(struct mail_save_context *ctx, uint32_t seq) { + struct index_mail *imail = (struct index_mail *)ctx->dest_mail; + + /* Close the mail before it's expunged. This allows it to be + reset cleanly. */ + imail->data.no_caching = TRUE; + imail->mail.v.close(&imail->mail.mail); + mail_index_expunge(ctx->transaction->itrans, seq); /* currently we can't just drop pending cache updates for this one specific record, so we'll reset the whole cache transaction. */