mbox: Looking up GUID/MD5(header) more than once was broken.

diff --git a/src/lib-storage/index/mbox/mbox-mail.c b/src/lib-storage/index/mbox/mbox-mail.c
index 852341c023acdf5cacd9639c8bf64303ee4f7622..0bb212063f216cf01b53a0f9e3570b8fd34f3fa3 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-mail.c
+++ b/src/lib-storage/index/mbox/mbox-mail.c
@@ -154,8 +154,10 @@ mbox_mail_get_md5_header(struct index_mail *mail, const char **value_r)
        struct mbox_mailbox *mbox = (struct mbox_mailbox *)mail->mail.mail.box;
        const void *ext_data;
 
-       if (mail->data.guid != NULL)
-               return mail->data.guid;
+       if (mail->data.guid != NULL) {
+               *value_r = mail->data.guid;
+               return TRUE;
+       }
 
        mail_index_lookup_ext(mail->mail.mail.transaction->view,
                              mail->mail.mail.seq, mbox->md5hdr_ext_idx,