From: Timo Sirainen <tss@iki.fi>
Date: Fri, 16 Dec 2011 10:43:51 +0000 (+0200)
Subject: fts: Expunging could have expunged indexed FTS mail from wrong mailbox.
X-Git-Tag: 2.1.rc2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee478390151150a62dfd4a9d4e7b3a3d3a6da06;p=thirdparty%2Fdovecot%2Fcore.git

fts: Expunging could have expunged indexed FTS mail from wrong mailbox.
---

diff --git a/src/plugins/fts/fts-expunge-log.c b/src/plugins/fts/fts-expunge-log.c
index 2b72f6e920..2d0c8dad39 100644
--- a/src/plugins/fts/fts-expunge-log.c
+++ b/src/plugins/fts/fts-expunge-log.c
@@ -206,8 +206,7 @@ void fts_expunge_log_append_next(struct fts_expunge_log_append_ctx *ctx,
 	struct fts_expunge_log_mailbox *mailbox;
 
 	if (ctx->prev_mailbox != NULL &&
-	    memcmp(mailbox_guid, ctx->prev_mailbox->guid,
-		   sizeof(mailbox_guid)) == 0)
+	    memcmp(mailbox_guid, ctx->prev_mailbox->guid, GUID_128_SIZE) == 0)
 		mailbox = ctx->prev_mailbox;
 	else {
 		mailbox = hash_table_lookup(ctx->mailboxes, mailbox_guid);