# HG changeset patch # User Timo Sirainen # Date 1361521898 -7200 # Node ID 73feea4d22aa8f8d2977f3814df34938a6d619c8 # Parent eece943c7521c7e91345346d2466b4c3b06dac01 doveadm, indexer: Don't crash if STATUS_LAST_CACHED_SEQ lookup fails. (I'm sure I did this change already once, where did it go?..) diff -r eece943c7521 -r 73feea4d22aa src/doveadm/doveadm-mail-index.c --- a/src/doveadm/doveadm-mail-index.c Sun Mar 24 12:09:39 2013 +0200 +++ b/src/doveadm/doveadm-mail-index.c Fri Feb 22 10:31:38 2013 +0200 @@ -38,10 +38,10 @@ int ret = 0; if (mailbox_get_metadata(box, MAILBOX_METADATA_PRECACHE_FIELDS, - &metadata) < 0) + &metadata) < 0 || + mailbox_get_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ, + &status) < 0) return -1; - mailbox_get_open_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ, - &status); seq = status.last_cached_seq + 1; if (seq > status.messages) { diff -r eece943c7521 -r 73feea4d22aa src/indexer/master-connection.c --- a/src/indexer/master-connection.c Sun Mar 24 12:09:39 2013 +0200 +++ b/src/indexer/master-connection.c Fri Feb 22 10:31:38 2013 +0200 @@ -68,11 +68,10 @@ int ret = 0; if (mailbox_get_metadata(box, MAILBOX_METADATA_PRECACHE_FIELDS, - &metadata) < 0) + &metadata) < 0 || + mailbox_get_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ, + &status) < 0) return -1; - - mailbox_get_open_status(box, STATUS_MESSAGES | STATUS_LAST_CACHED_SEQ, - &status); seq = status.last_cached_seq + 1; trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_NO_CACHE_DEC);