From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 10 Feb 2017 11:17:00 +0000 (+0200)
Subject: global: Add asserts to make static analyzer happier.
X-Git-Tag: 2.3.0.rc1~2140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adea69875046ece77dc36abd3f88a241a3f17ad9;p=thirdparty%2Fdovecot%2Fcore.git

global: Add asserts to make static analyzer happier.
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index c48d63e2e0..9a247dd1ee 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1446,6 +1446,7 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist,
 			} else if (name[0] == '!' && name == ldap_attr) {
 				/* !ldapAttr */
 				name = "";
+				i_assert(ldap_attr[0] == '!');
 				ldap_attr++;
 				field->skip = TRUE;
 			}
diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index 840a52c121..0e4ebb3375 100644
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -155,6 +155,7 @@ static void cmd_index_queue(struct index_cmd_context *ctx,
 {
 	if (ctx->queue_fd == -1)
 		index_queue_connect(ctx);
+	i_assert(ctx->queue_fd != -1);
 
 	T_BEGIN {
 		string_t *str = t_str_new(256);
diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c
index cb367bbc2b..6f8bde4e18 100644
--- a/src/lib-auth/auth-master.c
+++ b/src/lib-auth/auth-master.c
@@ -399,6 +399,7 @@ static int auth_master_run_cmd_pre(struct auth_master_connection *conn,
 	if (conn->fd == -1) {
 		if (auth_master_connect(conn) < 0)
 			return -1;
+		i_assert(conn->fd != -1);
 	}
 	auth_master_set_io(conn);
 
diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index 119f09b277..8741e22716 100644
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -554,6 +554,7 @@ static void fs_posix_write_stream(struct fs_file *_file)
 		_file->output = o_stream_create_error_str(errno, "%s",
 			fs_file_last_error(_file));
 	} else {
+		i_assert(file->fd != -1);
 		_file->output = o_stream_create_fd_file(file->fd,
 							(uoff_t)-1, FALSE);
 	}
diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 29e4cc9a4f..1db41ecbce 100644
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -323,6 +323,7 @@ mbox_save_init_file(struct mbox_save_context *ctx,
 		if (mbox_seek_to_end(ctx, &ctx->append_offset) < 0)
 			return -1;
 
+		i_assert(mbox->mbox_fd != -1);
 		ctx->output = o_stream_create_fd_file(mbox->mbox_fd,
 						      ctx->append_offset,
 						      FALSE);
diff --git a/src/lib-storage/mail-autoexpunge.c b/src/lib-storage/mail-autoexpunge.c
index b8f5aa8ada..26dc2c3c4d 100644
--- a/src/lib-storage/mail-autoexpunge.c
+++ b/src/lib-storage/mail-autoexpunge.c
@@ -226,6 +226,8 @@ void mail_user_autoexpunge(struct mail_user *user)
 		}
 	}
 	if (lock.fd != -1) {
+		i_assert(lock.lock != NULL);
+
 		i_unlink(lock.path);
 		i_close_fd(&lock.fd);
 		file_lock_free(&lock.lock);
diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c
index 75bb9a09a4..cf159a6c2c 100644
--- a/src/lib/file-dotlock.c
+++ b/src/lib/file-dotlock.c
@@ -565,6 +565,7 @@ dotlock_create(struct dotlock *dotlock, enum dotlock_create_flags flags,
 	file_lock_wait_end(dotlock->path);
 
 	if (ret > 0) {
+		i_assert(lock_info.fd != -1);
 		if (fstat(lock_info.fd, &st) < 0) {
 			i_error("fstat(%s) failed: %m", lock_path);
 			ret = -1;
diff --git a/src/lib/iostream-temp.c b/src/lib/iostream-temp.c
index 3141fb4b58..274764fb72 100644
--- a/src/lib/iostream-temp.c
+++ b/src/lib/iostream-temp.c
@@ -160,6 +160,7 @@ o_stream_temp_sendv(struct ostream_private *stream,
 	for (i = 0; i < iov_count; i++) {
 		if (tstream->buf->used + iov[i].iov_len > tstream->max_mem_size) {
 			if (o_stream_temp_move_to_fd(tstream) == 0) {
+				i_assert(tstream->fd != -1);
 				return o_stream_temp_fd_sendv(tstream, iov+i,
 							      iov_count-i);
 			}