Mercurial > dovecot > core-2.2
changeset 13255:f6c534c1baee
lazy-expunge: Fixed assert-crash when trying to open lazy-expunge mailbox.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 16 Aug 2011 19:19:10 +0300 |
| parents | 9c76b6239fff |
| children | 16d8a1c1543f |
| files | src/plugins/lazy-expunge/lazy-expunge-plugin.c |
| diffstat | 1 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c Tue Aug 16 19:06:55 2011 +0300 +++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c Tue Aug 16 19:19:10 2011 +0300 @@ -62,11 +62,33 @@ &mail_user_module_register); static struct mailbox * -mailbox_open_or_create(struct mailbox_list *list, const char *name, +mailbox_open_or_create(struct mailbox_list *list, struct mailbox *src_box, const char **error_r) { struct mailbox *box; enum mail_error error; + const char *name; + char src_sep, dest_sep; + + /* get the storage name, so it doesn't have namespace prefix */ + name = src_box->name; + /* replace hierarchy separators with destination separator */ + src_sep = mailbox_list_get_hierarchy_sep(src_box->list); + dest_sep = mailbox_list_get_hierarchy_sep(list); + if (src_sep != dest_sep) { + string_t *str = t_str_new(128); + unsigned int i; + + for (i = 0; name[i] != '\0'; i++) { + if (name[i] == src_sep) + str_append_c(str, dest_sep); + else + str_append_c(str, name[i]); + } + name = str_c(str); + } + /* add expunge namespace prefix */ + name = t_strconcat(list->ns->prefix, name, NULL); box = mailbox_alloc(list, name, MAILBOX_FLAG_KEEP_RECENT | MAILBOX_FLAG_NO_INDEX_FILES); @@ -105,7 +127,7 @@ if (lt->dest_box == NULL) { lt->dest_box = mailbox_open_or_create(luser->lazy_ns->list, - _mail->box->name, &error); + _mail->box, &error); if (lt->dest_box == NULL) { mail_storage_set_critical(_mail->box->storage, "lazy_expunge: Couldn't open expunge mailbox: "