From a114c9025aefb1727e5097bb844a724c294ad20b Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Thu, 23 May 2024 18:24:19 +0700
Subject: [PATCH] [*] Fixed error handling in the net command. Previously,
deleted objects were added to other JSN objects, which is incorrect.
---
modules/net/dap_chain_net.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 243726eb77..3aac9da563 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1304,7 +1304,7 @@ static int s_cli_net(int argc, char **argv, void **reply)
dap_json_rpc_error_add(DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS, "%s",
"Subcommand 'stats' requires one of parameter: tx");
#endif
- l_ret = DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS;
+ return DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS;
}
} else if ( l_go_str){
json_object *l_jobj_net = json_object_new_string(l_net->pub.name);
@@ -1352,9 +1352,10 @@ static int s_cli_net(int argc, char **argv, void **reply)
dap_chain_net_state_go_to(l_net, NET_STATE_SYNC_CHAINS);
l_ret = DAP_CHAIN_NET_JSON_RPC_OK;
} else {
+ json_object_put(l_jobj_return);
dap_json_rpc_error_add(DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_GO, "%s",
"Subcommand 'go' requires one of parameters: online, offline, sync\n");
- l_ret = DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_GO;
+ return DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_GO;
}
} else if ( l_get_str){
if ( strcmp(l_get_str,"status") == 0 ) {
@@ -1494,9 +1495,10 @@ static int s_cli_net(int argc, char **argv, void **reply)
json_object_object_add(l_jobj_return, "message", l_jobj_ret);
l_ret = DAP_CHAIN_NET_JSON_RPC_OK;
}else {
+ json_object_put(l_jobj_return);
dap_json_rpc_error_add(DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETERS_COMMAND_LINK, "%s",
"Subcommand 'link' requires one of parameters: list, add, del, info, disconnect_all");
- l_ret = DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETERS_COMMAND_LINK;
+ return DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETERS_COMMAND_LINK;
}
} else if( l_sync_str) {
--
GitLab