d2bf32cae3
including: 3e0cafd6 supplementary registry design documentation a6b8a2c0 bugfix:do purge container when do_start_container failed 2a307813 image store: add UT 255fada4 image layer:fix code style 6766ace8 bugfix:fix exec --detach for shim v2 3c9d51bf bugfix for workdir len verify f55efffa bug fix: Isula ps not display N/A when ports empty 9006b290 bugfix:overwriting when i is len-1 Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com> (cherry picked from commit ca9c755d85eeece47f587426603a8f0d5c99eac9)
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 9006b2901cb17b5cf0fa3579334ddb765ac3fe11 Mon Sep 17 00:00:00 2001
|
|
From: liuxu <liuxu156@huawei.com>
|
|
Date: Mon, 25 Nov 2024 19:42:02 +0800
|
|
Subject: [PATCH 01/19] bugfix:overwriting when i is len-1
|
|
|
|
Signed-off-by: liuxu <liuxu156@huawei.com>
|
|
---
|
|
src/daemon/modules/spec/specs.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/spec/specs.c b/src/daemon/modules/spec/specs.c
|
|
index 36e89343..67a47257 100644
|
|
--- a/src/daemon/modules/spec/specs.c
|
|
+++ b/src/daemon/modules/spec/specs.c
|
|
@@ -2779,8 +2779,11 @@ void spec_remove_mount(oci_runtime_spec *oci_spec, const char *dest)
|
|
for (i = 0; i < oci_spec->mounts_len; i++) {
|
|
if (strcmp(oci_spec->mounts[i]->destination, dest) == 0) {
|
|
free_defs_mount(oci_spec->mounts[i]);
|
|
- (void)memcpy((void **)&oci_spec->mounts[i], (void **)&oci_spec->mounts[i + 1],
|
|
- (oci_spec->mounts_len - i - 1) * sizeof(void *));
|
|
+ oci_spec->mounts[i] = NULL;
|
|
+ if (i != oci_spec->mounts_len - 1) {
|
|
+ (void)memcpy((void **)&oci_spec->mounts[i], (void **)&oci_spec->mounts[i + 1],
|
|
+ (oci_spec->mounts_len - i - 1) * sizeof(void *));
|
|
+ }
|
|
oci_spec->mounts_len--;
|
|
return;
|
|
}
|
|
--
|
|
2.23.0
|
|
|