# HG changeset patch # User Timo Sirainen # Date 1293615572 -7200 # Node ID 832d77536f077fa42dd7cd5f28de4ad4dc1279fc # Parent e6a9bf26ad1e4fb12728c7fda622f8266024a540 lib-storage: Crashfix for opening sdbox/mdbox mailbox. diff -r e6a9bf26ad1e -r 832d77536f07 src/lib-storage/index/index-storage.c --- a/src/lib-storage/index/index-storage.c Mon Dec 06 04:36:30 2010 +0000 +++ b/src/lib-storage/index/index-storage.c Wed Dec 29 11:39:32 2010 +0200 @@ -162,14 +162,6 @@ if (move_to_memory) ibox->index_flags &= ~MAIL_INDEX_OPEN_FLAG_CREATE; - if ((index_flags & MAIL_INDEX_OPEN_FLAG_NEVER_IN_MEMORY) != 0) { - if (mail_index_is_in_memory(box->index)) { - mail_storage_set_critical(box->storage, - "Couldn't create index file"); - return -1; - } - } - if (mailbox_list_create_missing_index_dir(box->list, box->name) < 0) { mail_storage_set_internal_error(box->storage); return -1; @@ -201,6 +193,13 @@ i_panic("in-memory index creation failed"); } } + if ((index_flags & MAIL_INDEX_OPEN_FLAG_NEVER_IN_MEMORY) != 0) { + if (mail_index_is_in_memory(box->index)) { + mail_storage_set_critical(box->storage, + "Couldn't create index file"); + return -1; + } + } box->cache = mail_index_get_cache(box->index); index_cache_register_defaults(box);