Fix slice append error

liubin · thaJeztah · commit e6cf5ec58d39 · 2023-01-24T20:51:24.000+01:00
In golang when copy a slice, if the slice is initialized with a desired length, then appending to it will cause the size double. Signed-off-by: bin liu <liubin0329@gmail.com> (cherry picked from commit 0c63c42) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
@@ -470,7 +470,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
 		}
 
 		if spec.Linux.Resources.HugepageLimits != nil {
-			hugepageLimits := make([]*runtime.HugepageLimit, len(spec.Linux.Resources.HugepageLimits))
+			hugepageLimits := make([]*runtime.HugepageLimit, 0)
 			for _, l := range spec.Linux.Resources.HugepageLimits {
 				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
 					PageSize: l.Pagesize,
diff --git a/pkg/cri/store/container/status.go b/pkg/cri/store/container/status.go
@@ -220,7 +220,7 @@ func deepCopyOf(s Status) Status {
 	}
 	copy.Resources = &runtime.ContainerResources{}
 	if s.Resources != nil && s.Resources.Linux != nil {
-		hugepageLimits := make([]*runtime.HugepageLimit, len(s.Resources.Linux.HugepageLimits))
+		hugepageLimits := make([]*runtime.HugepageLimit, 0)
 		for _, l := range s.Resources.Linux.HugepageLimits {
 			if l != nil {
 				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`if spec.Linux.Resources.HugepageLimits != nil {`
`473`		`- hugepageLimits := make([]*runtime.HugepageLimit, len(spec.Linux.Resources.HugepageLimits))`
	`473`	`+ hugepageLimits := make([]*runtime.HugepageLimit, 0)`
`474`	`474`	`for _, l := range spec.Linux.Resources.HugepageLimits {`
`475`	`475`	`hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{`
`476`	`476`	`PageSize: l.Pagesize,`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func deepCopyOf(s Status) Status {`
`220`	`220`	`}`
`221`	`221`	`copy.Resources = &runtime.ContainerResources{}`
`222`	`222`	`if s.Resources != nil && s.Resources.Linux != nil {`
`223`		`- hugepageLimits := make([]*runtime.HugepageLimit, len(s.Resources.Linux.HugepageLimits))`
	`223`	`+ hugepageLimits := make([]*runtime.HugepageLimit, 0)`
`224`	`224`	`for _, l := range s.Resources.Linux.HugepageLimits {`
`225`	`225`	`if l != nil {`
`226`	`226`	`hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{`