From 23e3b626239c92a45aebb04baabe6cbf8150d400 Mon Sep 17 00:00:00 2001
From: "pavel.uhanov" <pavel.uhanov@demlabs.net>
Date: Tue, 7 May 2024 12:46:21 +0300
Subject: [PATCH] [*] restore prev wrong deleting, update using
dap_global_db_driver_count
---
dap-sdk | 2 +-
modules/net/dap_chain_node_cli_cmd.c | 2 +-
modules/net/dap_chain_node_cli_cmd_tx.c | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index 3800d14867..360ddcfdbc 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 3800d14867e602f45b4ed6096193f5a0484b779b
+Subproject commit 360ddcfdbcf4eed35ddf74ecb8f273cad7bbd2a9
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index ccc75718b5..b448dfba22 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -813,7 +813,7 @@ int com_global_db(int a_argc, char ** a_argv, void **a_str_reply)
size_t l_count = 0;
for (dap_list_t *l_list = l_group_list; l_list; l_list = dap_list_next(l_list), ++l_count) {
dap_string_append_printf(l_ret_str, "\t%-40s : %zu records\n", (char*)l_list->data,
- dap_global_db_driver_count((char*)l_list->data, c_dap_global_db_driver_hash_blank));
+ dap_global_db_driver_count((char*)l_list->data, c_dap_global_db_driver_hash_blank, true));
}
dap_cli_server_cmd_set_reply_text(a_str_reply, "Group list:\n%sTotal count: %zu\n", l_ret_str->str, l_count);
dap_string_free(l_ret_str, true);
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index 15e225603e..703743f695 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -432,6 +432,8 @@ json_object* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain,
json_object * j_obj_tx = json_object_new_object();
if (!j_obj_tx || !j_arr_data) {
dap_json_rpc_allocation_error;
+ json_object_put(j_obj_tx);
+ json_object_put(j_arr_data);
return NULL;
}
if (!l_src_addr) {
@@ -516,6 +518,7 @@ json_object* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain,
json_object *j_obj_data = json_object_new_object();
if (!j_obj_data) {
dap_json_rpc_allocation_error;
+ json_object_put(j_arr_data);
json_object_put(j_obj_tx);
return NULL;
}
@@ -550,6 +553,7 @@ json_object* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain,
json_object * j_obj_data = json_object_new_object();
if (!j_obj_data) {
dap_json_rpc_allocation_error;
+ json_object_put(j_arr_data);
json_object_put(j_obj_tx);
return NULL;
}
--
GitLab