Make static analyzer happier.

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index cffa50ae8b030450f13ba931d0ba6a1740859416..c8c6f34d8abd0c70a307d6c632e6ca76d224ce00 100644 (file)
--- 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 9c24dc7bb38c032b393102c0d1c3283a1b09e8d4..14be6f301ac3ec4c5e3aa8960ee84eaf3637fe7c 100644 (file)
--- 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);