From: Timo Sirainen <tss@iki.fi>
Date: Mon, 26 May 2014 01:26:01 +0000 (+0300)
Subject: virtual: Crashfix: Don't deinitialize search args that haven't been initialized.
X-Git-Tag: 2.2.14.rc1~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbc5038bbef1397891c3f9ef3afd44ecfeaf457;p=thirdparty%2Fdovecot%2Fcore.git

virtual: Crashfix: Don't deinitialize search args that haven't been initialized.
---

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index 41e14c005b..cb836dbf88 100644
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -249,8 +249,11 @@ static void virtual_mailbox_close_internal(struct virtual_mailbox *mbox)
 		if (bboxes[i]->box == NULL)
 			continue;
 
-		if (bboxes[i]->search_args != NULL)
+		if (bboxes[i]->search_args != NULL &&
+		    bboxes[i]->search_args_initialized) {
 			mail_search_args_deinit(bboxes[i]->search_args);
+			bboxes[i]->search_args_initialized = FALSE;
+		}
 		mailbox_free(&bboxes[i]->box);
 		if (array_is_created(&bboxes[i]->sync_outside_expunges))
 			array_free(&bboxes[i]->sync_outside_expunges);