From: Timo Sirainen <tss@iki.fi>
Date: Sun, 24 Jun 2012 17:58:04 +0000 (+0300)
Subject: Make static analyzer happier.
X-Git-Tag: 2.2.alpha1~467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ea86ed7cf06ba04e4aa6cd1c4df9be336c06cd3;p=thirdparty%2Fdovecot%2Fcore.git

Make static analyzer happier.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index cffa50ae8b..c8c6f34d8a 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -331,6 +331,7 @@ static bool dsync_mailbox_try_save_cur(struct dsync_mailbox_importer *importer,
 	diff = importer_mail_cmp(&m1, &m2);
 	if (diff < 0) {
 		/* add a record for local mail */
+		i_assert(importer->cur_mail != NULL);
 		newmail->guid = p_strdup(importer->pool, importer->cur_guid);
 		newmail->uid = importer->cur_mail->uid;
 		newmail->uid_in_local = TRUE;
@@ -338,6 +339,7 @@ static bool dsync_mailbox_try_save_cur(struct dsync_mailbox_importer *importer,
 			newmail->uid >= importer->remote_uid_next;
 		remote_saved = FALSE;
 	} else if (diff > 0) {
+		i_assert(save_change != NULL);
 		newmail->guid = save_change->guid;
 		newmail->uid = save_change->uid;
 		newmail->uid_in_local = FALSE;
@@ -346,6 +348,8 @@ static bool dsync_mailbox_try_save_cur(struct dsync_mailbox_importer *importer,
 		remote_saved = TRUE;
 	} else {
 		/* identical */
+		i_assert(importer->cur_mail != NULL);
+		i_assert(save_change != NULL);
 		newmail->guid = save_change->guid;
 		newmail->uid = importer->cur_mail->uid;
 		newmail->uid_in_local = TRUE;
diff --git a/src/lib-index/mail-transaction-log-view.c b/src/lib-index/mail-transaction-log-view.c
index 9c24dc7bb3..14be6f301a 100644
--- a/src/lib-index/mail-transaction-log-view.c
+++ b/src/lib-index/mail-transaction-log-view.c
@@ -284,6 +284,8 @@ int mail_transaction_log_view_set_all(struct mail_transaction_log_view *view)
 {
 	struct mail_transaction_log_file *file, *first = view->log->files;
 
+	i_assert(first != NULL);
+
 	/* make sure .log.2 file is opened */
 	(void)mail_transaction_log_find_file(view->log, 1, FALSE, &file);