From: Timo Sirainen <tss@iki.fi>
Date: Fri, 4 Jun 2010 14:51:47 +0000 (+0100)
Subject: mail-log: If saved uid isn't available, log an error instead of crashing.
X-Git-Tag: 2.0.beta6~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=859eb18929e6cc132583a9b4a7e9439dab712391;p=thirdparty%2Fdovecot%2Fcore.git

mail-log: If saved uid isn't available, log an error instead of crashing.
This shouldn't happen, except when saving to virtual mailbox.

--HG--
branch : HEAD
---

diff --git a/src/plugins/mail-log/mail-log-plugin.c b/src/plugins/mail-log/mail-log-plugin.c
index 87af8f7b6c..e9255d40b4 100644
--- a/src/plugins/mail-log/mail-log-plugin.c
+++ b/src/plugins/mail-log/mail-log-plugin.c
@@ -358,16 +358,16 @@ mail_log_mail_transaction_commit(void *txn,
 	struct seq_range_iter iter;
 	unsigned int n = 0;
 	uint32_t uid;
-	bool ret;
 
 	seq_range_array_iter_init(&iter, &changes->saved_uids);
 	for (msg = ctx->messages; msg != NULL; msg = msg->next) {
 		if (msg->pretext == NULL) {
 			i_info("%s", msg->text);
 		} else {
-			ret = seq_range_array_iter_nth(&iter, n++, &uid);
-			i_assert(ret);
-			i_info("%s%u%s", msg->pretext, uid, msg->text);
+			if (seq_range_array_iter_nth(&iter, n++, &uid))
+				i_info("%s%u%s", msg->pretext, uid, msg->text);
+			else
+				i_info("%serror%s", msg->pretext, msg->text);
 		}
 	}
 	i_assert(!seq_range_array_iter_nth(&iter, n, &uid));