From: Timo Sirainen <tss@iki.fi>
Date: Fri, 3 Oct 2014 19:44:31 +0000 (+0300)
Subject: Make static analyzer happier
X-Git-Tag: 2.2.14~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c64840e98649f906a7b587c259d5b9e697c37498;p=thirdparty%2Fdovecot%2Fcore.git

Make static analyzer happier
---

diff --git a/src/auth/passdb-static.c b/src/auth/passdb-static.c
index 889b14df27..12d265d910 100644
--- a/src/auth/passdb-static.c
+++ b/src/auth/passdb-static.c
@@ -33,6 +33,7 @@ static_save_fields(struct auth_request *request, const char **password_r)
 	} 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 --git a/src/doveadm/doveadm-dict.c b/src/doveadm/doveadm-dict.c
index 107fb3cf46..9b4980468b 100644
--- a/src/doveadm/doveadm-dict.c
+++ b/src/doveadm/doveadm-dict.c
@@ -25,6 +25,7 @@ cmd_dict_init_full(int *argc, char **argv[], int own_arg_count, int key_arg_idx,
 	while ((c = getopt(*argc, *argv, getopt_args)) > 0) {
 		switch (c) {
 		case 'R':
+			i_assert(recurse != NULL);
 			*recurse = TRUE;
 			break;
 		case 'u':
diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c
index e48f2e11af..5ab0554332 100644
--- a/src/plugins/virtual/virtual-config.c
+++ b/src/plugins/virtual/virtual-config.c
@@ -77,6 +77,8 @@ virtual_config_add_rule(struct virtual_parse_context *ctx, const char **error_r)
 	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 @@ virtual_config_add_rule(struct virtual_parse_context *ctx, const char **error_r)
 	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;