From cd6d4fb431a50611b5f401f100a5cb8da9f0a971 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Fri, 11 Sep 2020 11:39:27 +0800 Subject: [PATCH 05/10] fix code review Signed-off-by: WangFengTu --- src/client/libisula.c | 5 ++++- src/cmd/isula/client_arguments.c | 3 +++ src/cmd/isula/images/login.c | 2 ++ src/cmd/isula/images/login.h | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/client/libisula.c b/src/client/libisula.c index 12b7ac5..67f44a7 100644 --- a/src/client/libisula.c +++ b/src/client/libisula.c @@ -489,6 +489,9 @@ void isula_top_response_free(struct isula_top_response *response) free(response->titles); response->titles = NULL; + free(response->errmsg); + response->errmsg = NULL; + if (response->processes_len && response->processes != NULL) { size_t i; for (i = 0; i < response->processes_len; i++) { @@ -1491,4 +1494,4 @@ void container_events_format_free(container_events_format_t *value) value->annotations = NULL; free(value); -} \ No newline at end of file +} diff --git a/src/cmd/isula/client_arguments.c b/src/cmd/isula/client_arguments.c index 7160ea7..894a45b 100644 --- a/src/cmd/isula/client_arguments.c +++ b/src/cmd/isula/client_arguments.c @@ -148,6 +148,9 @@ void client_arguments_free(struct client_arguments *args) return; } + free_sensitive_string(args->username); + free_sensitive_string(args->password); + free(args->name); args->name = NULL; diff --git a/src/cmd/isula/images/login.c b/src/cmd/isula/images/login.c index 32d6ea9..564097f 100644 --- a/src/cmd/isula/images/login.c +++ b/src/cmd/isula/images/login.c @@ -216,6 +216,8 @@ int cmd_login_main(int argc, const char **argv) } ret = client_login(&g_cmd_login_args); + free_sensitive_string(g_cmd_login_args.username); + free_sensitive_string(g_cmd_login_args.password); if (ret != 0) { exit(exit_code); } diff --git a/src/cmd/isula/images/login.h b/src/cmd/isula/images/login.h index dad619a..5f9a676 100644 --- a/src/cmd/isula/images/login.h +++ b/src/cmd/isula/images/login.h @@ -25,8 +25,8 @@ extern "C" { #endif #define LOGIN_OPTIONS(cmdargs) \ - { CMD_OPT_TYPE_STRING, false, "username", 'u', &(cmdargs).username, "Username", NULL }, \ - { CMD_OPT_TYPE_STRING, false, "password", 'p', &(cmdargs).password, "Password", NULL }, \ + { CMD_OPT_TYPE_STRING_DUP, false, "username", 'u', &(cmdargs).username, "Username", NULL }, \ + { CMD_OPT_TYPE_STRING_DUP, false, "password", 'p', &(cmdargs).password, "Password", NULL }, \ { CMD_OPT_TYPE_BOOL, \ false, \ "password-stdin", \ -- 2.25.1