Mercurial > dovecot > original-hg > dovecot-1.2

changeset 7322:a8963df83db2 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mailbox listing fix.
author Timo Sirainen <tss@iki.fi>
date Mon, 03 Mar 2008 06:01:07 +0200
parents 06f59be7f508
children bbafc37e3251
files src/lib-storage/list/mailbox-list-fs-iter.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Mar 03 02:54:46 2008 +0200
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Mar 03 06:01:07 2008 +0200
@@ -304,6 +304,7 @@
 	T_BEGIN {
 		info = ctx->next(ctx);
 	} T_END;
+	i_assert(info == NULL || info->name != NULL);
 	return info;
 }
 
@@ -424,8 +425,9 @@
 	else
 		ctx->info.name = NULL;
 
-	scan_subdir = (match2 & (IMAP_MATCH_YES | IMAP_MATCH_CHILDREN)) != 0;
+	scan_subdir = (match & (IMAP_MATCH_YES | IMAP_MATCH_CHILDREN)) != 0;
 	if ((match == IMAP_MATCH_YES || scan_subdir) &&
+	    ctx->info.name != NULL &&
 	    (ctx->ctx.flags & MAILBOX_LIST_ITER_RETURN_CHILDREN) != 0 &&
 	    (ctx->info.flags & (MAILBOX_CHILDREN | MAILBOX_NOCHILDREN)) == 0) {
 		scan_subdir = TRUE;