dovecot-2.2: Make static analyzer happier

dovecot at dovecot.org dovecot at dovecot.org
Fri Oct 3 21:15:33 UTC 2014


details:   http://hg.dovecot.org/dovecot-2.2/rev/dfef14b27eea
changeset: 17874:dfef14b27eea
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 03 22:44:31 2014 +0300
description:
Make static analyzer happier

diffstat:

 src/auth/passdb-static.c             |  1 +
 src/doveadm/doveadm-dict.c           |  1 +
 src/plugins/virtual/virtual-config.c |  3 +++
 3 files changed, 5 insertions(+), 0 deletions(-)

diffs (42 lines):

diff -r bc0629daf4d4 -r dfef14b27eea src/auth/passdb-static.c
--- a/src/auth/passdb-static.c	Fri Oct 03 22:39:53 2014 +0300
+++ b/src/auth/passdb-static.c	Fri Oct 03 22:44:31 2014 +0300
@@ -33,6 +33,7 @@
 	} else {
 		auth_request_log_info(request, AUTH_SUBSYS_DB,
 			"No password returned (and no nopassword)");
+		*password_r = NULL;
 		return PASSDB_RESULT_PASSWORD_MISMATCH;
 	}
 	return PASSDB_RESULT_OK;
diff -r bc0629daf4d4 -r dfef14b27eea src/doveadm/doveadm-dict.c
--- a/src/doveadm/doveadm-dict.c	Fri Oct 03 22:39:53 2014 +0300
+++ b/src/doveadm/doveadm-dict.c	Fri Oct 03 22:44:31 2014 +0300
@@ -25,6 +25,7 @@
 	while ((c = getopt(*argc, *argv, getopt_args)) > 0) {
 		switch (c) {
 		case 'R':
+			i_assert(recurse != NULL);
 			*recurse = TRUE;
 			break;
 		case 'u':
diff -r bc0629daf4d4 -r dfef14b27eea src/plugins/virtual/virtual-config.c
--- a/src/plugins/virtual/virtual-config.c	Fri Oct 03 22:39:53 2014 +0300
+++ b/src/plugins/virtual/virtual-config.c	Fri Oct 03 22:44:31 2014 +0300
@@ -77,6 +77,8 @@
 	struct mail_search_args *search_args;
 	unsigned int i, count;
 
+	*error_r = NULL;
+
 	if (ctx->rule_idx == array_count(&ctx->mbox->backend_boxes)) {
 		i_assert(str_len(ctx->rule) == 0);
 		return 0;
@@ -87,6 +89,7 @@
 	search_args = virtual_search_args_parse(ctx->rule, error_r);
 	str_truncate(ctx->rule, 0);
 	if (search_args == NULL) {
+		i_assert(*error_r != NULL);
 		*error_r = t_strconcat("Previous search rule is invalid: ",
 				       *error_r, NULL);
 		return -1;


More information about the dovecot-cvs mailing list