encode: avoid panic for nil embedded struct (#233)

guregu · May 18, 2024 · 8e12eac · 8e12eac
1 parent 17ebbaf
commit 8e12eac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/encode_test.go b/encode_test.go
@@ -87,6 +87,18 @@ var itemEncodeOnlyTests = []struct {
 			"Public": {N: aws.String("555")},
 		},
 	},
+	{
+		name: "nil exported pointer embedded struct",
+		in: struct {
+			ID string
+			*ExportedEmbedded
+		}{
+			ID: "abc",
+		},
+		out: map[string]*dynamodb.AttributeValue{
+			"ID": {S: aws.String("abc")},
+		},
+	},
 }
 
 func TestMarshal(t *testing.T) {

diff --git a/reflect.go b/reflect.go
@@ -106,6 +106,9 @@ func indirectPtrNoAlloc(rv reflect.Value) reflect.Value {
 func dig(rv reflect.Value, index []int) reflect.Value {
 	rv = indirectNoAlloc(rv)
 	for i, idx := range index {
+		if !rv.IsValid() {
+			break
+		}
 		if i == len(index)-1 {
 			rv = indirectPtrNoAlloc(rv.Field(idx))
 		} else {