diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c index 459932ec5d90c0f0484cd9e6f741ce19930fdd45..eb138da2b6feb5c4d1aad8bb7f486084e9ffc8b5 100644 --- a/modules/chain/dap_chain_ledger.c +++ b/modules/chain/dap_chain_ledger.c @@ -4370,6 +4370,9 @@ dap_list_t * dap_chain_ledger_get_txs(dap_ledger_t *a_ledger, size_t a_count, si dap_list_t *l_list = NULL; size_t l_counter = 0; size_t l_end = l_offset + a_count; + if (!l_ledger_priv->ledger_items) { + return NULL; + } dap_chain_ledger_tx_item_t *l_ptr = l_ledger_priv->ledger_items->hh.tbl->tail->prev; if (!l_ptr) l_ptr = l_ledger_priv->ledger_items; diff --git a/modules/chain/tests/dap_chain_ledger_tests.c b/modules/chain/tests/dap_chain_ledger_tests.c index d7c019e9f36f26b2e2d40ad79b22eee384ac3c36..6780258f57302a9ed0798d13ea6c13ebbdf08a1f 100644 --- a/modules/chain/tests/dap_chain_ledger_tests.c +++ b/modules/chain/tests/dap_chain_ledger_tests.c @@ -358,7 +358,8 @@ void dap_chain_ledger_test_write_back_list(dap_ledger_t *a_ledger, dap_cert_t *a } void dap_chain_ledger_test_run(void){ - dap_chain_net_id_t l_iddn = dap_chain_net_id_from_str("0x0xFA0"); + dap_chain_net_id_t l_iddn = {0}; + dap_sscanf("0xFA0", "0x%16"DAP_UINT64_FORMAT_x, &l_iddn.uint64); dap_print_module_name("dap_chain_ledger"); uint16_t l_flags = 0; l_flags |= DAP_CHAIN_LEDGER_CHECK_TOKEN_EMISSION; @@ -412,4 +413,4 @@ void dap_chain_ledger_test_run(void){ dap_chain_ledger_test_double_spending(l_ledger, &l_hash_btx, l_cert->enc_key, l_iddn); dap_chain_ledger_test_excess_supply(l_ledger, l_cert, &l_addr); dap_chain_ledger_test_write_back_list(l_ledger, l_cert, l_iddn); -} \ No newline at end of file +} diff --git a/modules/common/dap_chain_common.c b/modules/common/dap_chain_common.c index 199df7af91565d8641249370b486ad6374835a68..fc613668244d38ff576d2b8a2f12b0d151ef95e3 100644 --- a/modules/common/dap_chain_common.c +++ b/modules/common/dap_chain_common.c @@ -115,6 +115,7 @@ dap_chain_addr_t* dap_chain_addr_from_str(const char *a_str) return NULL; } +#if 0 /** * @brief dap_chain_net_id_from_str * @param a_net_str @@ -125,13 +126,13 @@ dap_chain_net_id_t dap_chain_net_id_from_str(const char * a_net_str) dap_chain_net_id_t l_ret={ 0 }; log_it(L_DEBUG, "net id: %s", a_net_str); - a_net_str += 2; if (!(l_ret.uint64 = strtoll(a_net_str, NULL, 0))) { log_it(L_ERROR, "Wrong input string \"%s\" not recognized as network id", a_net_str); return l_ret; } return l_ret; } +#endif /** * @brief dap_chain_net_srv_uid_from_str diff --git a/modules/common/include/dap_chain_common.h b/modules/common/include/dap_chain_common.h index a983ced719baedbb99a3c44145e705a34b5e35f5..fe8c66d844b38fc22f4844d8c876ecd998491fdb 100644 --- a/modules/common/include/dap_chain_common.h +++ b/modules/common/include/dap_chain_common.h @@ -242,7 +242,9 @@ size_t dap_chain_hash_slow_to_str(dap_chain_hash_slow_t * a_hash, char * a_str, char* dap_chain_addr_to_str(const dap_chain_addr_t *a_addr); dap_chain_addr_t* dap_chain_addr_from_str(const char *str); +#if 0 dap_chain_net_id_t dap_chain_net_id_from_str(const char* a_str); +#endif dap_chain_net_srv_uid_t dap_chain_net_srv_uid_from_str(const char* a_str); void dap_chain_addr_fill(dap_chain_addr_t *a_addr, dap_sign_type_t a_type, dap_chain_hash_fast_t *a_pkey_hash, dap_chain_net_id_t a_net_id); diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c index 35b61523a0affc2e78ee41ba5762691a39f65c3a..c762017a3767df85780cb37c9b0bdbf0debdd440 100644 --- a/modules/type/blocks/dap_chain_cs_blocks.c +++ b/modules/type/blocks/dap_chain_cs_blocks.c @@ -1395,6 +1395,9 @@ static dap_list_t *s_callback_get_atoms(dap_chain_t *a_chain, size_t a_count, si dap_list_t *l_list = NULL; size_t l_counter = 0; size_t l_end = l_offset + a_count; + if (!l_blocks_pvt->blocks) { + return NULL; + } if (a_reverse) { dap_chain_block_cache_t *l_ptr = l_blocks_pvt->blocks->hh.tbl->tail->prev; if (!l_ptr) diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index f5a7db1da6c6d12035ba8c97ecb0b2825b457120..361bd35f11cda40053833451036919e7679d6f8d 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -1899,6 +1899,9 @@ static dap_list_t *s_callback_get_atoms(dap_chain_t *a_chain, size_t a_count, si dap_list_t *l_list = NULL; size_t l_counter = 0; size_t l_end = l_offset + a_count; + if (!l_dag_pvt->events){ + return NULL; + } dap_chain_cs_dag_event_item_t *l_ptr = l_dag_pvt->events->hh.tbl->tail->prev; if (!l_ptr) l_ptr = l_dag_pvt->events;