From: Timo Sirainen Date: Thu, 16 Jan 2025 11:14:35 +0000 (+0200) Subject: global: Add asserts to make scan-build happy X-Git-Tag: 2.4.0~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df8463e6591ff07a5cc31f68525f3ab4a19bee03;p=thirdparty%2Fdovecot%2Fcore.git global: Add asserts to make scan-build happy --- diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c index cb70e6d6c5..d12a1575e0 100644 --- a/src/auth/db-ldap.c +++ b/src/auth/db-ldap.c @@ -1416,6 +1416,7 @@ db_ldap_result_finish_debug(struct db_ldap_result_iterate_context *ctx) if (ctx->ldap_request->result_logged) return; + i_assert(ctx->debug != NULL); orig_len = str_len(ctx->debug); if (orig_len == 0) { e_debug(authdb_event(ctx->ldap_request->auth_request), diff --git a/src/config/config-parser.c b/src/config/config-parser.c index 4b4fd476cb..cdf60e8825 100644 --- a/src/config/config-parser.c +++ b/src/config/config-parser.c @@ -747,8 +747,10 @@ config_apply_exact_line(struct config_parser_context *ctx, for (; config_key != NULL; config_key = config_key->next) { struct config_module_parser *l = &ctx->cur_section->filter_parser->module_parsers[config_key->info_idx]; - if (l->settings == NULL) + if (l->settings == NULL) { config_module_parser_init(ctx, l); + i_assert(l->settings != NULL); + } switch (l->info->defines[config_key->define_idx].type) { case SET_STRLIST: if (config_apply_strlist(ctx, key, value, config_key, @@ -953,10 +955,10 @@ again: /* the only '/' left should be if key is under list/ */ key = key_with_path; - if (ctx->cur_section->filter_parser->filter.filter_name != NULL && - ctx->cur_section->filter_parser->filter.filter_name_array) { + if (ctx->cur_section->filter_parser->filter.filter_name_array) { /* For named list filters, try filter name { key } -> filter_name_key first before anything else. */ + i_assert(ctx->cur_section->filter_parser->filter.filter_name != NULL); const char *filter_key = filter_key_skip_group_prefix( t_str_replace(ctx->cur_section->filter_parser->filter.filter_name, '/', '_')); const char *key2 = t_strdup_printf("%s_%s", filter_key, key); @@ -2662,6 +2664,8 @@ void config_parser_apply_line(struct config_parser_context *ctx, filter_key, key); if (config_key_can_autoprefix(ctx, key2)) key = key2; + } else { + i_assert(!cur_filter->filter_name_array); } ctx->cur_section = config_add_new_section(ctx); diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index a5dabb0c81..21284d6d62 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -946,6 +946,8 @@ static int driver_cassandra_init_ssl(struct cassandra_db *db, const char **error struct settings_file file; CassError c_err; + i_assert(ssl_set != NULL); + db->ssl = cass_ssl_new(); i_assert(db->ssl != NULL); diff --git a/src/plugins/fts/fts-build-mail.c b/src/plugins/fts/fts-build-mail.c index ad133a5323..e0eb564637 100644 --- a/src/plugins/fts/fts-build-mail.c +++ b/src/plugins/fts/fts-build-mail.c @@ -341,6 +341,8 @@ fts_build_tokenized(struct fts_mail_build_context *ctx, const struct language *lang; int ret; + i_assert(ctx->pending_input != NULL); + if (ctx->cur_user_lang != NULL) { /* we already have a language */ } else if ((ret = fts_detect_language(ctx, data, size, last, &lang)) < 0) {