From: Timo Sirainen <tss@iki.fi>
Date: Tue, 20 Jul 2010 14:02:02 +0000 (+0100)
Subject: lib-storage: Fix to hooks with multiple plugins
X-Git-Tag: 2.0.rc3~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b1593c998c55240bdb52f10fdcc33a5f9d11881;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fix to hooks with multiple plugins
---

diff --git a/src/lib-storage/mail-storage-hooks.c b/src/lib-storage/mail-storage-hooks.c
index b20959b168..abba9e447c 100644
--- a/src/lib-storage/mail-storage-hooks.c
+++ b/src/lib-storage/mail-storage-hooks.c
@@ -176,8 +176,10 @@ hook_update_mask(struct hook_build_context *ctx, struct hook_stack *stack,
 	unsigned int i;
 
 	for (i = 0; i < ctx->count; i++) {
-		if (stack->vfuncs[i] != vlast[i])
-			stack->mask[i] = vlast[i];
+		if (stack->vfuncs[i] != vlast[i]) {
+			i_assert(stack->vfuncs[i] != NULL);
+			stack->mask[i] = stack->vfuncs[i];
+		}
 	}
 }