932bd564ae
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 1adaa5c0c5dd4f162457c656c9d0fd6ffa8f2358)
28 lines
1008 B
Diff
28 lines
1008 B
Diff
From e0c800749961cf9f97b6a767ea3f7628a568a33d Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Mon, 6 Mar 2023 17:22:16 +0800
|
|
Subject: [PATCH 26/26] change goto branch
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
src/daemon/executor/container_cb/execution_stream.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/daemon/executor/container_cb/execution_stream.c b/src/daemon/executor/container_cb/execution_stream.c
|
|
index 1a7353b5..7e928cf7 100644
|
|
--- a/src/daemon/executor/container_cb/execution_stream.c
|
|
+++ b/src/daemon/executor/container_cb/execution_stream.c
|
|
@@ -161,7 +161,8 @@ static int container_exec_cb(const container_exec_request *request, container_ex
|
|
|
|
if (exec_container(cont, request, *response, stdinfd, stdout_handler, stderr_handler) != 0) {
|
|
ret = -1;
|
|
- goto pack_err_response;
|
|
+ // pack err response in exec_container, there is no need to pack here.
|
|
+ goto out;
|
|
}
|
|
|
|
goto out;
|
|
--
|
|
2.25.1
|
|
|