dovecot-2.2: lib-storage: Make sure mail_sesarch_args_simplify_s...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/c4cfb7f95bc6
changeset: 19475:c4cfb7f95bc6
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Dec 06 19:26:44 2015 +0200
description:
lib-storage: Make sure mail_sesarch_args_simplify_sub() is called enough times.

diffstat:

 src/lib-storage/mail-search-args-simplify.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 7c984bcb5f57 -r c4cfb7f95bc6 src/lib-storage/mail-search-args-simplify.c
--- a/src/lib-storage/mail-search-args-simplify.c	Sun Dec 06 19:25:20 2015 +0200
+++ b/src/lib-storage/mail-search-args-simplify.c	Sun Dec 06 19:26:44 2015 +0200
@@ -471,6 +471,7 @@
 			for (; sub->next != NULL; sub = sub->next) ;
 			sub->next = args->next;
 			*args = *args->value.subargs;
+			ctx.removals = TRUE;
 			continue;
 		}
 
@@ -609,7 +610,8 @@
 	if (mail_search_args_unnest_inthreads(args, &args->args,
 					      FALSE, TRUE)) {
 		/* we may have added some extra SUBs that could be dropped */
-		mail_search_args_simplify_sub(args->box, args->pool, args->args, TRUE);
+		if (mail_search_args_simplify_sub(args->box, args->pool, args->args, TRUE))
+			removals = TRUE;
 	}
 	while (removals)
 		removals = mail_search_args_simplify_sub(args->box, args->pool, args->args, TRUE);