From c82460b704563b2f468d4e3ab27e8c7c842fe58b Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Fri, 19 Jan 2024 14:07:12 +0300
Subject: [PATCH] [*] Autocollect status segfault fix
---
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 2 +-
modules/type/blocks/dap_chain_cs_blocks.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 5ce9425bc6..f60f227347 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -402,7 +402,7 @@ bool dap_chain_esbocs_get_autocollect_status(dap_chain_net_id_t a_net_id)
dap_chain_esbocs_session_t *l_session;
DL_FOREACH(s_session_items, l_session) {
if (l_session->chain->net_id.uint64 == a_net_id.uint64) {
- if (l_session->esbocs && l_session->esbocs->_pvt &&
+ if (l_session->esbocs && l_session->esbocs->_pvt && PVT(l_session->esbocs)->collecting_addr &&
!dap_chain_addr_is_blank(PVT(l_session->esbocs)->collecting_addr))
return true;
else
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 80aaa37728..c822b9827d 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -453,7 +453,8 @@ static void s_cli_meta_hex_print( dap_string_t * a_str_tmp, const char * a_meta
static void s_print_autocollect_table(dap_chain_net_t *a_net, dap_string_t *a_reply_str, const char *a_table_name)
{
bool l_status = dap_chain_esbocs_get_autocollect_status(a_net->pub.id);
- dap_string_append_printf(a_reply_str, "\nAutocollect status is %s\n", l_status ? "active" : "inactive, cause the network config or consensus starting problems");
+ dap_string_append_printf(a_reply_str, "\nAutocollect status for network %s is %s\n", a_net->pub.name,
+ l_status ? "active" : "inactive, cause the network config or consensus starting problems");
if (!l_status)
return;
dap_string_append_printf(a_reply_str, "\nAutocollect tables content for:\n=== %s ===\n", a_table_name);
--
GitLab