From: Timo Sirainen <tss@iki.fi>
Date: Tue, 26 May 2009 04:39:25 +0000 (-0400)
Subject: convert plugin: Don't crash after finishing conversion.
X-Git-Tag: 2.0.alpha1~676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91393778f98e772d74203ec824be3611d8bf489d;p=thirdparty%2Fdovecot%2Fcore.git

convert plugin: Don't crash after finishing conversion.

--HG--
branch : HEAD
---

diff --git a/src/plugins/convert/convert-storage.c b/src/plugins/convert/convert-storage.c
index 3a76a8c848..efe06faac3 100644
--- a/src/plugins/convert/convert-storage.c
+++ b/src/plugins/convert/convert-storage.c
@@ -406,9 +406,11 @@ int convert_storage(const char *source_data,
 	memset(&ns_set, 0, sizeof(ns_set));
 	ns_set.location = source_data;
 
+	i_assert(user->namespaces == dest_namespaces);
 	source_ns = mail_namespaces_init_empty(user);
-	source_ns->set = &ns_set;
+	user->namespaces = dest_namespaces;
 
+	source_ns->set = &ns_set;
 	if (mail_storage_create(source_ns, NULL,
 				MAIL_STORAGE_FLAG_NO_AUTOCREATE, &error) < 0) {
 		/* No need for conversion. */