From: Timo Sirainen <tss@iki.fi>
Date: Fri, 11 Jun 2010 20:39:11 +0000 (+0100)
Subject: mailbox_list_get_unexpanded_path(): Don't crash with -o mail_location=..
X-Git-Tag: 2.0.beta6~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a514fb20e04df397842cde11cc9ea92abfe9728;p=thirdparty%2Fdovecot%2Fcore.git

mailbox_list_get_unexpanded_path(): Don't crash with -o mail_location=..

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index b1f61ef4d4..becf5c7a3b 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -323,6 +323,10 @@ const char *mailbox_list_get_unexpanded_path(struct mailbox_list *list,
 			user->unexpanded_set, MAIL_STORAGE_SET_DRIVER_NAME);
 		i_assert(mail_set != NULL);
 		location = mail_set->mail_location;
+		if (*location == '1') {
+			/* we'll get here if using -o mail_location=.. */
+			return "";
+		}
 		i_assert(*location == '0');
 		location++;
 	}