Merge pull request #810 from shyamradhakrishnan/shyamradhakrishnan-fi…

…x-809 🐛 Fix implicit aliasing issue in nested maps
kubernetes-sigs · Aug 10, 2023 · d18ba5c · d18ba5c
2 parents 0089762 + 766a447
commit d18ba5c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/pkg/deepcopy/testdata/cronjob_types.go b/pkg/deepcopy/testdata/cronjob_types.go
@@ -125,6 +125,7 @@ type SpecificCases struct {
 	MapWithNamedKeys              map[TotallyAString]int        `json:"mapWithNamedKeys"`
 	MapToPtrToDeepCopyIntoRefType map[string]*DeepCopyIntoRef   `json:"mapToPtrToDeepCopyIntoRefType"`
 	MapToDeepCopyIntoRefType      map[string]DeepCopyIntoRef    `json:"mapToDeepCopyIntoRefType"`
+	MapNested                     map[string]map[string]string  `json:"mapNested,omitempty"`
 
 	// other slice types
 	SliceToDeepCopyPtr        []DeepCopyPtr        `json:"sliceToDeepCopyPtr"`

diff --git a/pkg/deepcopy/testdata/zz_generated.deepcopy.go b/pkg/deepcopy/testdata/zz_generated.deepcopy.go
diff --git a/pkg/deepcopy/traverse.go b/pkg/deepcopy/traverse.go
@@ -374,7 +374,8 @@ func (c *copyMethodMaker) genMapDeepCopy(actualName *namingInfo, mapType *types.
 				c.IfElse("val == nil", func() {
 					c.Line("(*out)[key] = nil")
 				}, func() {
-					c.Line("in, out := &val, &outVal")
+					c.Line("inVal := (*in)[key]")
+					c.Line("in, out := &inVal, &outVal")
 					c.genDeepCopyIntoBlock(&namingInfo{typeInfo: mapType.Elem()}, mapType.Elem())
 				})
 				c.Line("(*out)[key] = outVal")