From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 5 Jun 2016 12:23:45 +0000 (+0300)
Subject: mbox: Fixed expunging first mail with CRLF linefeeds.
X-Git-Tag: 2.2.25.rc1~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1e4cd378d8f6bbe8dbbd78d81dbe6c97a059aea;p=thirdparty%2Fdovecot%2Fcore.git

mbox: Fixed expunging first mail with CRLF linefeeds.
---

diff --git a/src/lib-storage/index/mbox/mbox-sync-rewrite.c b/src/lib-storage/index/mbox/mbox-sync-rewrite.c
index ef902441a7..63bb4c125c 100644
--- a/src/lib-storage/index/mbox/mbox-sync-rewrite.c
+++ b/src/lib-storage/index/mbox/mbox-sync-rewrite.c
@@ -354,7 +354,7 @@ static int mbox_sync_read_next(struct mbox_sync_context *sync_ctx,
 	}
 
 	first_mail_expunge_extra = 1 +
-		sync_ctx->first_mail_crlf_expunged ? 1 : 0;
+		(sync_ctx->first_mail_crlf_expunged ? 1 : 0);
 	if (mails[idx].from_offset +
 	    first_mail_expunge_extra - expunged_space != 0) {
 		sync_ctx->dest_first_mail = mails[idx].from_offset == 0;