From 02ccc6d388a735c0c7a69cfc611a360718ca8d68 Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Fri, 14 Jul 2023 12:15:40 +0700 Subject: [PATCH 1/2] [*] change shoed wallet name length --- dap-sdk | 2 +- modules/net/dap_chain_node_cli_cmd.c | 2 +- modules/wallet/dap_chain_wallet.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dap-sdk b/dap-sdk index 15a26c4c06..69c7a2d5e3 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 15a26c4c061355b21dba20b56bb0a92efcd49343 +Subproject commit 69c7a2d5e3eb1514323622e89d0e0cdc677ebaaa diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index f6668b1cf5..d80360984c 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -2068,7 +2068,7 @@ char l_buf[1024]; l_seed, l_seed_size, l_pass_str); if (!l_wallet) - return dap_cli_server_cmd_set_reply_text(a_str_reply, "Wallet is not created because of internal error"), -1; + return dap_cli_server_cmd_set_reply_text(a_str_reply, "Wallet is not created because of internal error. Check name or password length (max 64 chars)"), -1; dap_chain_addr_t *l_addr = l_net? dap_chain_wallet_get_addr(l_wallet,l_net->pub.id ) : NULL; diff --git a/modules/wallet/dap_chain_wallet.c b/modules/wallet/dap_chain_wallet.c index d23c3681de..e00ffd40e8 100644 --- a/modules/wallet/dap_chain_wallet.c +++ b/modules/wallet/dap_chain_wallet.c @@ -838,7 +838,7 @@ uint32_t l_csum = CRC32C_INIT, l_csum2 = CRC32C_INIT; DAP_CHAIN_WALLET_INTERNAL_LOCAL_NEW(l_wallet); assert(l_wallet_internal); - snprintf(l_wallet->name, DAP_WALLET$SZ_NAME, "%.*s", l_file_hdr.wallet_len, l_wallet_name); + snprintf(l_wallet->name, DAP_WALLET$SZ_NAME + 1, "%.*s", l_file_hdr.wallet_len, l_wallet_name); strncpy(l_wallet_internal->file_name, a_file_name, sizeof(l_wallet_internal->file_name) - 1); l_wallet_internal->certs_count = l_certs_count; -- GitLab From b9f34760ca4cff0a4bd49ce1f714e12f8d1bc7bf Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Fri, 14 Jul 2023 14:23:28 +0700 Subject: [PATCH 2/2] [*] subs update --- dap-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dap-sdk b/dap-sdk index 69c7a2d5e3..507f092908 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 69c7a2d5e3eb1514323622e89d0e0cdc677ebaaa +Subproject commit 507f09290863169f6b5815c312382daae167cab3 -- GitLab