dovecot-2.1: lib-storage: Don't crash when no there are no mailb...

dovecot at dovecot.org dovecot at dovecot.org
Mon Dec 5 21:23:48 EET 2011


details:   http://hg.dovecot.org/dovecot-2.1/rev/272b705f0938
changeset: 13797:272b705f0938
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Dec 05 21:23:40 2011 +0200
description:
lib-storage: Don't crash when no there are no mailbox {} sections.

diffstat:

 src/lib-storage/mail-storage.c      |  3 +++
 src/lib-storage/mailbox-list-iter.c |  2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

diffs (25 lines):

diff -r c067025026ed -r 272b705f0938 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c	Fri Dec 02 23:47:01 2011 +0200
+++ b/src/lib-storage/mail-storage.c	Mon Dec 05 21:23:40 2011 +0200
@@ -607,6 +607,9 @@
 {
 	struct mailbox_settings *const *box_set;
 
+	if (!array_is_created(&user->set->mailboxes))
+		return NULL;
+
 	array_foreach(&user->set->mailboxes, box_set) {
 		if (strcmp((*box_set)->name, vname) == 0)
 			return *box_set;
diff -r c067025026ed -r 272b705f0938 src/lib-storage/mailbox-list-iter.c
--- a/src/lib-storage/mailbox-list-iter.c	Fri Dec 02 23:47:01 2011 +0200
+++ b/src/lib-storage/mailbox-list-iter.c	Mon Dec 05 21:23:40 2011 +0200
@@ -78,6 +78,8 @@
 	struct autocreate_box *autobox;
 	unsigned int i, count;
 
+	if (!array_is_created(&user->set->mailboxes))
+		return;
 	box_sets = array_get(&user->set->mailboxes, &count);
 	if (count == 0)
 		return;


More information about the dovecot-cvs mailing list