diff --git a/scanner/adapter_hs/adapter_hs.cpp b/scanner/adapter_hs/adapter_hs.cpp index ba691b2..b458fef 100644 --- a/scanner/adapter_hs/adapter_hs.cpp +++ b/scanner/adapter_hs/adapter_hs.cpp @@ -749,7 +749,6 @@ int adapter_hs_scan_stream(struct adapter_hs_stream *hs_stream, const char *data } unsigned long long pattern_ids[MAX_SCANNER_HIT_PATTERN_NUM]; - memset(pattern_ids, 0, sizeof(unsigned long long) * MAX_SCANNER_HIT_PATTERN_NUM); for (size_t i = 0; i < n_pattern_id; i++) { if (i >= MAX_SCANNER_HIT_PATTERN_NUM) { diff --git a/src/maat_bool_plugin.c b/src/maat_bool_plugin.c index dc0caa0..11ecc8d 100644 --- a/src/maat_bool_plugin.c +++ b/src/maat_bool_plugin.c @@ -514,7 +514,6 @@ int bool_plugin_runtime_get_ex_data(void *bool_plugin_runtime, unsigned long lon } struct bool_expr_match results[n_ex_data]; - memset(results, 0, sizeof(results)); n_item = ull_dedup(item_ids, n_item); assert(bool_plugin_rt->matcher != NULL); diff --git a/src/maat_compile.c b/src/maat_compile.c index 20e08c0..2e48fbd 100644 --- a/src/maat_compile.c +++ b/src/maat_compile.c @@ -1924,7 +1924,6 @@ int maat_compile_state_update(struct rcu_hash_table *item_htable, int vtable_id, { struct maat_item *item = NULL; long long hit_group_ids[MAX_SCANNER_HIT_GROUP_NUM]; - memset(hit_group_ids, -1, sizeof(hit_group_ids)); size_t hit_group_cnt = 0; for (size_t i = 0; i < hit_item_cnt; i++) { @@ -1970,7 +1969,6 @@ int maat_compile_state_update(struct rcu_hash_table *item_htable, int vtable_id, } long long top_group_ids[MAX_SCANNER_HIT_GROUP_NUM]; - memset(top_group_ids, -1, sizeof(top_group_ids)); int top_group_cnt = group2group_runtime_get_top_groups(g2g_rt, hit_group_ids, hit_group_cnt, top_group_ids); diff --git a/src/maat_expr.c b/src/maat_expr.c index 136738e..284956f 100644 --- a/src/maat_expr.c +++ b/src/maat_expr.c @@ -907,7 +907,6 @@ int expr_runtime_scan(struct expr_runtime *expr_rt, int thread_id, const char *d size_t n_hit_item = 0; struct hs_scan_result hit_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_results, 0, sizeof(hit_results)); int ret = adapter_hs_scan(expr_rt->hs, thread_id, data, data_len, hit_results, MAX_SCANNER_HIT_ITEM_NUM, @@ -931,8 +930,6 @@ int expr_runtime_scan(struct expr_runtime *expr_rt, int thread_id, const char *d struct maat_item_inner *item = NULL; int real_hit_item_cnt = 0; long long district_id = state->district_id; - - memset(hit_item_ids, -1, sizeof(hit_item_ids)); for (size_t i = 0; i < n_hit_item; i++) { item = (struct maat_item_inner *)(hit_results[i].user_tag); @@ -971,7 +968,6 @@ int expr_runtime_stream_scan(struct expr_runtime *expr_rt, struct adapter_hs_str size_t n_hit_item = 0; struct hs_scan_result hit_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_results, 0, sizeof(hit_results)); int ret = adapter_hs_scan_stream(s_handle, data, data_len, hit_results, MAX_SCANNER_HIT_ITEM_NUM, &n_hit_item); if (ret < 0) { @@ -990,7 +986,6 @@ int expr_runtime_stream_scan(struct expr_runtime *expr_rt, struct adapter_hs_str } long long hit_item_ids[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_item_ids, -1, sizeof(hit_item_ids)); for (size_t i = 0; i < n_hit_item; i++) { hit_item_ids[i] = hit_results[i].item_id; diff --git a/src/maat_flag.c b/src/maat_flag.c index e67b606..eb165c9 100644 --- a/src/maat_flag.c +++ b/src/maat_flag.c @@ -543,7 +543,6 @@ int flag_runtime_scan(struct flag_runtime *flag_rt, int thread_id, } struct flag_result hit_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_results, 0, sizeof(hit_results)); int n_hit_item = flag_matcher_match(flag_rt->matcher, flag, hit_results, MAX_SCANNER_HIT_ITEM_NUM); @@ -562,8 +561,6 @@ int flag_runtime_scan(struct flag_runtime *flag_rt, int thread_id, struct maat_item_inner *item = NULL; int real_hit_item_cnt = 0; long long district_id = state->district_id; - - memset(hit_item_ids, -1, sizeof(hit_item_ids)); for (int i = 0; i < n_hit_item; i++) { item = (struct maat_item_inner *)(hit_results[i].user_tag); diff --git a/src/maat_fqdn_plugin.c b/src/maat_fqdn_plugin.c index a769584..12f4672 100644 --- a/src/maat_fqdn_plugin.c +++ b/src/maat_fqdn_plugin.c @@ -510,7 +510,6 @@ int fqdn_plugin_runtime_get_ex_data(void *fqdn_plugin_runtime, const char *query } struct FQDN_match results[n_ex_data]; - memset(results, 0, sizeof(results)); assert(fqdn_plugin_rt->engine != NULL); int n_result = FQDN_engine_search(fqdn_plugin_rt->engine, query_fqdn, strlen(query_fqdn), results, n_ex_data); diff --git a/src/maat_interval.c b/src/maat_interval.c index 0c14842..86d066c 100644 --- a/src/maat_interval.c +++ b/src/maat_interval.c @@ -540,7 +540,6 @@ int interval_runtime_scan(struct interval_runtime *interval_rt, int thread_id, } struct interval_result hit_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_results, 0, sizeof(hit_results)); int n_hit_item = interval_matcher_match(interval_rt->matcher, integer, hit_results, MAX_SCANNER_HIT_ITEM_NUM); @@ -560,8 +559,6 @@ int interval_runtime_scan(struct interval_runtime *interval_rt, int thread_id, int real_hit_item_cnt = 0; long long district_id = state->district_id; - memset(hit_item_ids, -1, sizeof(hit_item_ids)); - for (int i = 0; i < n_hit_item; i++) { item = (struct maat_item_inner *)(hit_results[i].user_tag); if (item->district_id == district_id || item->district_id == DISTRICT_ANY) { diff --git a/src/maat_ip.c b/src/maat_ip.c index b716adf..0a27407 100644 --- a/src/maat_ip.c +++ b/src/maat_ip.c @@ -691,7 +691,6 @@ int ip_runtime_scan(struct ip_runtime *ip_rt, int thread_id, int ip_type, } struct scan_result ip_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(ip_results, 0, sizeof(ip_results)); /* if ip_addr = "0.0.0.0" means any ip */ int any_ip_flag = 0; @@ -718,12 +717,10 @@ int ip_runtime_scan(struct ip_runtime *ip_rt, int thread_id, int ip_type, int ret = 0; size_t real_hit_index = 0; long long hit_item_ids[MAX_SCANNER_HIT_ITEM_NUM]; - memset(hit_item_ids, -1, sizeof(hit_item_ids)); // any ip, so scan port+proto if (1 == any_ip_flag) { struct interval_result port_results[MAX_SCANNER_HIT_ITEM_NUM]; - memset(port_results, 0, sizeof(port_results)); uint16_t host_port = ntohs(port); int n_hit_port_item = interval_matcher_match(ip_rt->intval_matcher, host_port, port_results, MAX_SCANNER_HIT_ITEM_NUM); diff --git a/src/maat_ip_plugin.c b/src/maat_ip_plugin.c index d40ae27..ebdf422 100644 --- a/src/maat_ip_plugin.c +++ b/src/maat_ip_plugin.c @@ -548,8 +548,6 @@ int ip_plugin_runtime_get_ex_data(void *ip_plugin_runtime, const struct ip_addr } struct scan_result results[n_ex_data]; - memset(results, 0, sizeof(results)); - struct ip_data ip_data = *(const struct ip_data *)ip_addr; if (ip_data.type == IPv4) { ip_data.ipv4 = ntohl(ip_data.ipv4);