Mercurial > dovecot > core-2.2
changeset 15301:0306792cc843
lib-storage: Don't crash when searching multiple keywords.
Fixed by simply removing the keyword merging code.
mail_search_args_simplify() is called before mail_search_args_init(), so the
keywords are still NULL and merging can't be done. Alternative fix would
have been to add string array to mail_search_arg.value containing the
keywords, but all of this is a pretty unnecessary optimization.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 05 Oct 2012 00:15:01 +0300 |
parents | 28be06dbd65e |
children | d96313048f17 |
files | src/lib-storage/mail-search.c |
diffstat | 1 files changed, 0 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-search.c Wed Oct 03 05:43:27 2012 +0300 +++ b/src/lib-storage/mail-search.c Fri Oct 05 00:15:01 2012 +0300 @@ -586,48 +586,14 @@ return TRUE; } -static struct mail_keywords * -mail_search_keywords_merge(struct mailbox *box, - struct mail_keywords **_kw1, - struct mail_keywords **_kw2) -{ - struct mail_keywords *kw1 = *_kw1, *kw2 = *_kw2; - struct mail_keywords *new_kw; - - i_assert(kw1->index == kw2->index); - T_BEGIN { - ARRAY_TYPE(keyword_indexes) new_indexes; - unsigned int i, j; - - t_array_init(&new_indexes, kw1->count + kw2->count + 1); - array_append(&new_indexes, kw1->idx, kw1->count); - for (i = 0; i < kw2->count; i++) { - /* don't add duplicates */ - for (j = 0; j < kw1->count; j++) { - if (kw1->idx[j] == kw2->idx[i]) - break; - } - if (j == kw1->count) - array_append(&new_indexes, kw2->idx+i, 1); - } - new_kw = mailbox_keywords_create_from_indexes(box, - &new_indexes); - } T_END; - mailbox_keywords_unref(_kw1); - mailbox_keywords_unref(_kw2); - return new_kw; -} - static void mail_search_args_simplify_sub(struct mailbox *box, struct mail_search_arg *args, bool parent_and) { struct mail_search_arg *sub, *prev = NULL; struct mail_search_arg *prev_flags_arg, *prev_not_flags_arg; - struct mail_search_arg *prev_kw_arg, *prev_not_kw_arg; prev_flags_arg = prev_not_flags_arg = NULL; - prev_kw_arg = prev_not_kw_arg = NULL; while (args != NULL) { if (args->match_not && (args->type == SEARCH_SUB || args->type == SEARCH_OR)) { @@ -689,35 +655,6 @@ } } - /* merge all keywords arguments */ - if (args->type == SEARCH_KEYWORDS && - !args->match_not && parent_and) { - if (prev_kw_arg == NULL) - prev_kw_arg = args; - else { - prev_kw_arg->value.keywords = - mail_search_keywords_merge(box, - &prev_kw_arg->value.keywords, - &args->value.keywords); - prev->next = args->next; - args = args->next; - continue; - } - } else if (args->type == SEARCH_KEYWORDS && - args->match_not && !parent_and) { - if (prev_not_kw_arg == NULL) - prev_not_kw_arg = args; - else { - prev_not_kw_arg->value.keywords = - mail_search_keywords_merge(box, - &prev_not_kw_arg->value.keywords, - &args->value.keywords); - prev->next = args->next; - args = args->next; - continue; - } - } - prev = args; args = args->next; }