From: Timo Sirainen <tss@iki.fi>
Date: Sat, 27 Mar 2010 03:03:57 +0000 (+0200)
Subject: lib-storage: Fix to previous change: Don't access freed memory.
X-Git-Tag: 2.0.beta5~264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88869da3c4da2bbbc1d2e53004d4760be54d1fa9;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fix to previous change: Don't access freed memory.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 1f5dbeb8ee..d21d141dc2 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -865,7 +865,7 @@ int mailbox_sync_deinit(struct mailbox_sync_context **_ctx,
 			struct mailbox_sync_status *status_r)
 {
 	struct mailbox_sync_context *ctx = *_ctx;
-	struct mail_storage *storage = ctx->box->storage;
+	struct mailbox *box = ctx->box;
 	const char *errormsg;
 	enum mail_error error;
 	int ret;
@@ -873,12 +873,12 @@ int mailbox_sync_deinit(struct mailbox_sync_context **_ctx,
 	*_ctx = NULL;
 
 	memset(status_r, 0, sizeof(*status_r));
-	ret = ctx->box->v.sync_deinit(ctx, status_r);
-	if (ret < 0 && ctx->box->inbox &&
-	    !storage->user->inbox_open_error_logged) {
-		errormsg = mail_storage_get_last_error(storage, &error);
+	ret = box->v.sync_deinit(ctx, status_r);
+	if (ret < 0 && box->inbox &&
+	    !box->storage->user->inbox_open_error_logged) {
+		errormsg = mail_storage_get_last_error(box->storage, &error);
 		if (error == MAIL_ERROR_NOTPOSSIBLE) {
-			storage->user->inbox_open_error_logged = TRUE;
+			box->storage->user->inbox_open_error_logged = TRUE;
 			i_error("Syncing INBOX failed: %s", errormsg);
 		}
 	}