dovecot-2.0: mailbox_list_get_unexpanded_path(): Don't crash if ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/6e1247609440
changeset: 11546:6e1247609440
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jun 14 20:39:06 2010 +0100
description:
mailbox_list_get_unexpanded_path(): Don't crash if namespace location is already expanded.

diffstat:

 src/lib-storage/mailbox-list.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d110c46e6936 -r 6e1247609440 src/lib-storage/mailbox-list.c
--- a/src/lib-storage/mailbox-list.c	Mon Jun 14 19:48:10 2010 +0100
+++ b/src/lib-storage/mailbox-list.c	Mon Jun 14 20:39:06 2010 +0100
@@ -315,6 +315,11 @@
 	struct mailbox_list_settings set;
 	const char *p, *error;
 
+	if (*location == '1') {
+		/* set using -o or userdb lookup. */
+		return "";
+	}
+
 	i_assert(*location == '0');
 	location++;
 
@@ -323,10 +328,8 @@
 			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=.. */
+		if (*location == '1')
 			return "";
-		}
 		i_assert(*location == '0');
 		location++;
 	}