From: Timo Sirainen <tss@iki.fi>
Date: Wed, 23 Jun 2010 15:58:18 +0000 (+0100)
Subject: mdbox: Fixed assert-crash on storage rebuild if file got lost.
X-Git-Tag: 2.0.rc1~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28287520e06f30cc76630c0ac3b93ae468f5883c;p=thirdparty%2Fdovecot%2Fcore.git

mdbox: Fixed assert-crash on storage rebuild if file got lost.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index b61ceaa0f1..67879722f2 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -614,7 +614,7 @@ static int rebuild_restore_msg(struct mdbox_storage_rebuild_context *ctx,
 	   saved to */
 	file = mdbox_file_init(ctx->storage, msg->file_id);
 	ret = dbox_file_open(file, &deleted);
-	if (ret > 0)
+	if (ret > 0 && !deleted)
 		ret = dbox_file_get_mail_stream(file, msg->offset, NULL);
 	if (ret > 0 && !deleted && dbox_file_metadata_read(file) > 0) {
 		mailbox = dbox_file_metadata_get(file,