42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 219d340263a0791be24ce7a9a8f300bc9342a4ec Mon Sep 17 00:00:00 2001
|
|
From: haozi007 <liuhao27@huawei.com>
|
|
Date: Thu, 2 Jul 2020 19:55:18 +0800
|
|
Subject: [PATCH 10/12] init struct
|
|
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
|
---
|
|
src/services/execution/execute/execution_stream.c | 3 ++-
|
|
src/services/execution/manager/container_unix.c | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/services/execution/execute/execution_stream.c b/src/services/execution/execute/execution_stream.c
|
|
index 4576898..5b3ad4e 100644
|
|
--- a/src/services/execution/execute/execution_stream.c
|
|
+++ b/src/services/execution/execute/execution_stream.c
|
|
@@ -496,7 +496,8 @@ err_out:
|
|
return NULL;
|
|
}
|
|
|
|
-static int exec_container(container_t *cont, const char *runtime, char * const console_fifos[], defs_process_user *puser,
|
|
+static int exec_container(container_t *cont, const char *runtime, char * const console_fifos[],
|
|
+ defs_process_user *puser,
|
|
const container_exec_request *request, int *exit_code)
|
|
{
|
|
int ret = 0;
|
|
diff --git a/src/services/execution/manager/container_unix.c b/src/services/execution/manager/container_unix.c
|
|
index f18ed15..a3578e7 100644
|
|
--- a/src/services/execution/manager/container_unix.c
|
|
+++ b/src/services/execution/manager/container_unix.c
|
|
@@ -591,7 +591,7 @@ static int container_save_config_v2(const container_t *cont)
|
|
int ret = 0;
|
|
char *json_v2 = NULL;
|
|
parser_error err = NULL;
|
|
- container_config_v2 config_v2;
|
|
+ container_config_v2 config_v2 = {0};
|
|
|
|
if (cont == NULL) {
|
|
return -1;
|
|
--
|
|
2.20.1
|
|
|