diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c index 0cc37432f7cf43baa07b28b1880da29ba5c7c8a0..594cb98472109285614b1f9002caef06e7c731fb 100644 --- a/modules/net/dap_chain_net.c +++ b/modules/net/dap_chain_net.c @@ -1816,10 +1816,10 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) } ++j; } - l_net->pub.bridged_networks = j && j < i - ? DAP_REALLOC_COUNT(l_net->pub.bridged_networks, j) - : ( DAP_DELETE(l_net->pub.bridged_networks), NULL ); - l_net->pub.bridged_networks_count = j; + if (j < i) { + l_net->pub.bridged_networks = DAP_REALLOC_COUNT(l_net->pub.bridged_networks, j); // Can be NULL, it's ok + l_net->pub.bridged_networks_count = j; + } } const char **l_permanent_nodes_addrs = dap_config_get_array_str(l_cfg, "general", "permanent_nodes_addrs", &l_net_pvt->permanent_links_count); diff --git a/modules/net/dap_chain_node.c b/modules/net/dap_chain_node.c index c26cd67ab13bcfb91367b31ff0ae38aace5796c7..2522622171a24f884df1ea208336220d9f152a3f 100644 --- a/modules/net/dap_chain_node.c +++ b/modules/net/dap_chain_node.c @@ -525,12 +525,11 @@ dap_list_t *dap_chain_node_get_states_list_sort(dap_chain_net_t *a_net, dap_chai DAP_DELETE(l_node_info_data); } else l_node_info = (dap_chain_node_net_states_info_t*)l_node_info_data; + l_item->role.enums = l_node_info->role.enums; + l_item->atoms_count = l_node_info->info_v1.atoms_count; + l_item->events_count = l_node_info->info_v1.events_count; + l_item->downlinks_count = l_node_info->info_v1.downlinks_count; } - - l_item->role.enums = l_node_info->role.enums; - l_item->atoms_count = l_node_info->info_v1.atoms_count; - l_item->events_count = l_node_info->info_v1.events_count; - l_item->downlinks_count = l_node_info->info_v1.downlinks_count; l_item->timestamp = l_state_timestamp; l_ret = dap_list_insert_sorted(l_ret, (void *)l_item, s_node_states_info_cmp); DAP_DELETE(l_node_info);