dovecot-1.2: Check mail_set_uid() return value properly.

dovecot at dovecot.org dovecot at dovecot.org
Sat Dec 13 15:01:29 EET 2008


details:   http://hg.dovecot.org/dovecot-1.2/rev/868ce575a3e6
changeset: 8540:868ce575a3e6
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Dec 13 15:01:21 2008 +0200
description:
Check mail_set_uid() return value properly.

diffstat:

2 files changed, 4 insertions(+), 4 deletions(-)
src/lib-storage/index/index-thread.c |    5 ++---
src/plugins/virtual/virtual-mail.c   |    3 ++-

diffs (28 lines):

diff -r 280c92d3a80c -r 868ce575a3e6 src/lib-storage/index/index-thread.c
--- a/src/lib-storage/index/index-thread.c	Sat Dec 13 14:59:39 2008 +0200
+++ b/src/lib-storage/index/index-thread.c	Sat Dec 13 15:01:21 2008 +0200
@@ -73,9 +73,8 @@ mail_strmap_rec_get_msgid(struct mail_th
 	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 -r 280c92d3a80c -r 868ce575a3e6 src/plugins/virtual/virtual-mail.c
--- a/src/plugins/virtual/virtual-mail.c	Sat Dec 13 14:59:39 2008 +0200
+++ b/src/plugins/virtual/virtual-mail.c	Sat Dec 13 15:01:21 2008 +0200
@@ -107,7 +107,8 @@ static void virtual_mail_set_seq(struct 
 			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);
 


More information about the dovecot-cvs mailing list