lib-storage: Fix mailbox's vsize header check for mailboxes not in dovecot.list.index

If mailbox wasn't yet in the dovecot.list.index, mailbox_list_index_status()
for it returns FALSE and doesn't initialize the status. In some situations this
may have caused a non-empty mailbox's vsize to be returned as 0.

diff --git a/src/lib-storage/list/mailbox-list-index-status.c b/src/lib-storage/list/mailbox-list-index-status.c
index b42aeb7f44ce94febb8636d237592bc4ded45062..2ab557c5aaee8eed02709054e2de54d2ab06c041 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index-status.c
+++ b/src/lib-storage/list/mailbox-list-index-status.c
@@ -264,11 +264,10 @@ static int index_list_get_cached_vsize(struct mailbox *box, uoff_t *vsize_r)
        ret = mailbox_list_index_status(box->list, view, seq,
                                        STATUS_MESSAGES | STATUS_UIDNEXT,
                                        &status, NULL, &vsize) ? 1 : 0;
-       if (status.messages == 0 && status.uidnext > 0) {
+       if (ret > 0 && status.messages == 0 && status.uidnext > 0) {
                /* mailbox is empty. its size has to be zero, regardless of
                   what the vsize header says. */
                vsize.vsize = 0;
-               ret = 1;
        } else if (ret > 0 && (vsize.highest_uid + 1 != status.uidnext ||
                               vsize.message_count != status.messages)) {
                /* out of date vsize info */