Check mail_set_uid() return value properly.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/index-thread.c b/src/lib-storage/index/index-thread.c
index 76be3dcd9a26786c69c08facd7d1548a30bf9f7d..b2b84804aa0de535dd34514589618676de4a1dfe 100644 (file)
--- a/src/lib-storage/index/index-thread.c
+++ b/src/lib-storage/index/index-thread.c
@@ -73,9 +73,8 @@ mail_strmap_rec_get_msgid(struct mail_thread_context *ctx,
        unsigned int n = 0;
        int ret;
 
-       ret = mail_set_uid(ctx->tmp_mail, rec->uid);
-       if (ret <= 0)
-               return ret;
+       if (!mail_set_uid(ctx->tmp_mail, rec->uid))
+               return 0;
 
        switch (rec->ref_index) {
        case MAIL_THREAD_NODE_REF_MSGID:

diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c
index 56aade28fb611a89a7d946d2ab7d7691d6fc9512..1b132a8c5232156f5d1a758d5101bb8ffb6fa7eb 100644 (file)
--- a/src/plugins/virtual/virtual-mail.c
+++ b/src/plugins/virtual/virtual-mail.c
@@ -107,7 +107,8 @@ static void virtual_mail_set_seq(struct mail *mail, uint32_t seq)
                        mailbox_header_lookup_unref(&backend_headers);
                array_append(&vmail->backend_mails, &vmail->backend_mail, 1);
        }
-       mail_set_uid(vmail->backend_mail, vrec->real_uid);
+       if (!mail_set_uid(vmail->backend_mail, vrec->real_uid))
+               i_unreached();
        memset(&vmail->imail.data, 0, sizeof(vmail->imail.data));
        p_clear(vmail->imail.data_pool);