From 76348ae8f79226956253c266dc29234caa0047f1 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Thu, 8 Sep 2022 10:31:04 +0800 Subject: [PATCH] invalid free default-runtime and cri-runtime after free json-confs Signed-off-by: zhangxiaoyu --- ...ault-runtime-and-cri-runtime-after-f.patch | 45 +++++++++++++++++++ iSulad.spec | 9 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0006-invalid-free-default-runtime-and-cri-runtime-after-f.patch diff --git a/0006-invalid-free-default-runtime-and-cri-runtime-after-f.patch b/0006-invalid-free-default-runtime-and-cri-runtime-after-f.patch new file mode 100644 index 0000000..5bc8a55 --- /dev/null +++ b/0006-invalid-free-default-runtime-and-cri-runtime-after-f.patch @@ -0,0 +1,45 @@ +From 710aa3de0e21c3566934897dd34a9ac497f808a7 Mon Sep 17 00:00:00 2001 +From: zhangxiaoyu +Date: Thu, 8 Sep 2022 10:14:39 +0800 +Subject: [PATCH 6/6] invalid free default-runtime and cri-runtime after free + json-confs + +Signed-off-by: zhangxiaoyu +--- + src/cmd/isulad/isulad_commands.h | 2 +- + src/daemon/config/daemon_arguments.c | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/cmd/isulad/isulad_commands.h b/src/cmd/isulad/isulad_commands.h +index dc278f9c..a89de5c1 100644 +--- a/src/cmd/isulad/isulad_commands.h ++++ b/src/cmd/isulad/isulad_commands.h +@@ -166,7 +166,7 @@ int command_default_ulimit_append(command_option_t *option, const char *arg); + SUP_GROUPS_OPT(cmdargs) \ + { CMD_OPT_TYPE_CALLBACK, \ + false, \ +- "registry-mirrors", \ ++ "registry-mirrors", \ + 0, \ + &(cmdargs)->json_confs->registry_mirrors, \ + "Registry to be prepended when pulling unqualified images, can be specified multiple times", \ +diff --git a/src/daemon/config/daemon_arguments.c b/src/daemon/config/daemon_arguments.c +index 076c10a6..04173557 100644 +--- a/src/daemon/config/daemon_arguments.c ++++ b/src/daemon/config/daemon_arguments.c +@@ -204,12 +204,6 @@ void service_arguments_free(struct service_arguments *args) + free_default_ulimit(args->default_ulimit); + args->default_ulimit = NULL; + args->default_ulimit_len = 0; +- +- free(args->json_confs->default_runtime); +- args->json_confs->default_runtime = NULL; +- +- free_json_map_string_string(args->json_confs->cri_runtimes); +- args->json_confs->cri_runtimes = NULL; + } + + static int key_value_opt_parser(const char *option, char **key, char **value) +-- +2.25.1 + diff --git a/iSulad.spec b/iSulad.spec index f71840f..1585d0e 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.16 -%global _release 3 +%global _release 4 %global is_systemd 1 %global enable_shimv2 1 %global is_embedded 1 @@ -18,6 +18,7 @@ Patch0002: 0002-cleancode-about-rest-register-container.patch Patch0003: 0003-adapt-to-openssl-3.0.patch Patch0004: 0004-remove-redundant-header-files.patch Patch0005: 0005-add-isulad-args.patch +Patch0006: 0006-invalid-free-default-runtime-and-cri-runtime-after-f.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -245,6 +246,12 @@ fi %endif %changelog +* Thu Sep 08 2022 zhangxiaoyu - 2.0.16-4 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: invalid free default-runtime and cri-runtime after free json-confs + * Wed Sep 07 2022 zhangxiaoyu - 2.0.16-3 - Type: enhancement - ID: NA