Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8192:32aa972895cc HEAD
Transaction view: lookup_ext() crashed if extension was just being added within the transaction.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Thu, 11 Sep 2008 23:16:27 +0300 |
parents | f14e68845b6b |
children | b3fb8215a339 |
files | src/lib-index/mail-index-transaction-view.c |
diffstat | 1 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index-transaction-view.c Thu Sep 11 18:47:19 2008 +0300 +++ b/src/lib-index/mail-index-transaction-view.c Thu Sep 11 23:16:27 2008 +0300 @@ -194,16 +194,36 @@ const void *data, uint32_t ext_id) { const struct mail_index_ext *ext; + const struct mail_index_registered_ext *rext; + const struct mail_transaction_ext_intro *intro; + unsigned int record_align, record_size; uint32_t ext_idx; /* data begins with a 32bit sequence, followed by the actual extension data */ data = CONST_PTR_OFFSET(data, sizeof(uint32_t)); - if (!mail_index_map_get_ext_idx(tview->lookup_map, ext_id, &ext_idx)) - i_unreached(); + if (!mail_index_map_get_ext_idx(tview->lookup_map, ext_id, &ext_idx)) { + /* we're adding the extension now. */ + rext = array_idx(&tview->view.index->extensions, ext_id); + record_align = ext->record_align; + record_size = ext->record_size; + } else { + ext = array_idx(&tview->lookup_map->extensions, ext_idx); + record_align = ext->record_align; + record_size = ext->record_size; + } - ext = array_idx(&tview->lookup_map->extensions, ext_idx); + /* see if the extension has been resized within this transaction */ + if (array_is_created(&tview->t->ext_resizes) && + ext_id < array_count(&tview->t->ext_resizes)) { + intro = array_idx(&tview->t->ext_resizes, ext_id); + if (intro[ext_id].name_size != 0) { + record_align = intro->record_align; + record_size = intro->record_size; + } + } + if (ext->record_align <= sizeof(uint32_t)) { /* data is 32bit aligned already */ return data;