dovecot-2.1: lib-storage: Crashfix to previous change.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/e3c4a86fb63b
changeset: 14044:e3c4a86fb63b
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 01 21:27:45 2012 +0200
description:
lib-storage: Crashfix to previous change.

diffstat:

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

diffs (28 lines):

diff -r d01932c7828a -r e3c4a86fb63b src/lib-storage/mailbox-list.c
--- a/src/lib-storage/mailbox-list.c	Wed Feb 01 20:30:18 2012 +0200
+++ b/src/lib-storage/mailbox-list.c	Wed Feb 01 21:27:45 2012 +0200
@@ -157,13 +157,13 @@
 	list->set.inbox_path = p_strdup(list->pool, set->inbox_path);
 	list->set.subscription_fname =
 		p_strdup(list->pool, set->subscription_fname);
-	list->set.maildir_name = set->maildir_name == NULL ? "" :
+	list->set.maildir_name =
 		p_strdup(list->pool, set->maildir_name);
 	list->set.mailbox_dir_name =
 		p_strdup(list->pool, set->mailbox_dir_name);
 	list->set.alt_dir = p_strdup(list->pool, set->alt_dir);
 
-	if (set->mailbox_dir_name == NULL || *set->mailbox_dir_name == '\0')
+	if (*set->mailbox_dir_name == '\0')
 		list->set.mailbox_dir_name = "";
 	else if (set->mailbox_dir_name[strlen(set->mailbox_dir_name)-1] == '/') {
 		list->set.mailbox_dir_name =
@@ -249,6 +249,8 @@
 	*error_r = NULL;
 
 	memset(set_r, 0, sizeof(*set_r));
+	set_r->maildir_name = "";
+	set_r->mailbox_dir_name = "";
 
 	if (*data == '\0')
 		return 0;