27 lines
896 B
Diff
27 lines
896 B
Diff
From 2888c4de723200b85888cc7c2cf8b5c0b9a3c59e Mon Sep 17 00:00:00 2001
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
Date: Thu, 4 Feb 2021 10:49:43 +0800
|
|
Subject: [PATCH 1/2] fix CNI_ARGS value when there is no args
|
|
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
---
|
|
src/invoke/args.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/invoke/args.c b/src/invoke/args.c
|
|
index dae484e..2b357ed 100644
|
|
--- a/src/invoke/args.c
|
|
+++ b/src/invoke/args.c
|
|
@@ -126,7 +126,7 @@ static int add_cni_envs(const struct cni_args *cniargs, size_t *pos, char **resu
|
|
}
|
|
result[i++] = buffer;
|
|
buffer = NULL;
|
|
- nret = asprintf(&buffer, "%s=%s", ENV_CNI_ARGS, plugin_args_str);
|
|
+ nret = asprintf(&buffer, "%s=%s", ENV_CNI_ARGS, plugin_args_str == NULL ? "" : plugin_args_str);
|
|
if (nret < 0) {
|
|
ERROR("Sprintf failed");
|
|
goto free_out;
|
|
--
|
|
2.25.1
|
|
|