dovecot-2.1: lib-storage: Avoid assert-crashing with non-mUTF7/U...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/7d0d76df719f
changeset: 14176:7d0d76df719f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Feb 21 03:07:49 2012 +0200
description:
lib-storage: Avoid assert-crashing with non-mUTF7/UTF8 entries in subscriptions file.

diffstat:

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

diffs (20 lines):

diff -r 488fe9d417eb -r 7d0d76df719f src/lib-storage/list/mailbox-list-subscriptions.c
--- a/src/lib-storage/list/mailbox-list-subscriptions.c	Tue Feb 21 02:59:25 2012 +0200
+++ b/src/lib-storage/list/mailbox-list-subscriptions.c	Tue Feb 21 03:07:49 2012 +0200
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "ioloop.h"
 #include "array.h"
+#include "unichar.h"
 #include "imap-match.h"
 #include "subscription-file.h"
 #include "mailbox-tree.h"
@@ -92,6 +93,8 @@
 		return -1;
 	} else {
 		vname = mailbox_list_get_vname(list, name);
+		if (!uni_utf8_str_is_valid(vname))
+			return -1;
 		node = mailbox_tree_get(list->subscriptions, vname, &created);
 		node->flags = MAILBOX_SUBSCRIBED;
 	}