fix embedded pointers

Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
kubernetes-sigs · Oct 21, 2021 · 2a9c1a2 · 2a9c1a2
1 parent 9cce9fd
commit 2a9c1a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/yaml.go b/yaml.go
@@ -240,6 +240,12 @@ cast_type:
 						// struct field.
 						jtf := t
 						for _, i := range f.index {
+							if jtf.Kind() == reflect.Ptr {
+								if jtf.IsNil() {
+									jtf = reflect.New(jtf.Type().Elem())
+								}
+								jtf = jtf.Elem()
+							}
 							jtf = jtf.Field(i)
 						}
 

diff --git a/yaml_test.go b/yaml_test.go
@@ -83,6 +83,11 @@ type WithEmbed struct {
 	B string `json:"b"`
 }
 
+type WithPtrEmbed struct {
+	*Inner
+	B string `json:"b"`
+}
+
 type unmarshalTestCase struct {
 	encoded    []byte
 	decodeInto interface{}
@@ -205,6 +210,14 @@ func TestUnmarshal(t *testing.T) {
 				B:     "11",
 			},
 		},
+		{
+			encoded:    []byte("a: 10\nb: 11\n"),
+			decodeInto: new(WithPtrEmbed),
+			decoded: WithPtrEmbed{
+				Inner: &Inner{A: "10"},
+				B:     "11",
+			},
+		},
 		{
 			encoded:    []byte("a: 3.0\nb: 3\n"),
 			decodeInto: new(interface{}),