Fix panic on pointer to embedded struct

christarazi · christarazi · commit 1cc601931628 · 2020-09-17T11:32:46.000-07:00
This commit converts an embedded struct into its original type if it is a pointer. Fixes: #172 Signed-off-by: Chris Tarazi <tarazichris@gmail.com>
diff --git a/value/reflectcache.go b/value/reflectcache.go
@@ -150,7 +150,11 @@ func buildStructCacheEntry(t reflect.Type, infos map[string]*FieldCacheEntry, fi
 			continue
 		}
 		if isInline {
-			buildStructCacheEntry(field.Type, infos, append(fieldPath, field.Index))
+			e := field.Type
+			if field.Type.Kind() == reflect.Ptr {
+				e = field.Type.Elem()
+			}
+			buildStructCacheEntry(e, infos, append(fieldPath, field.Index))
 			continue
 		}
 		info := &FieldCacheEntry{JsonName: jsonName, isOmitEmpty: isOmitempty, fieldPath: append(fieldPath, field.Index), fieldType: field.Type}

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,11 @@ func buildStructCacheEntry(t reflect.Type, infos map[string]*FieldCacheEntry, fi`
`150`	`150`	`continue`
`151`	`151`	`}`
`152`	`152`	`if isInline {`
`153`		`- buildStructCacheEntry(field.Type, infos, append(fieldPath, field.Index))`
	`153`	`+ e := field.Type`
	`154`	`+ if field.Type.Kind() == reflect.Ptr {`
	`155`	`+ e = field.Type.Elem()`
	`156`	`+ }`
	`157`	`+ buildStructCacheEntry(e, infos, append(fieldPath, field.Index))`
`154`	`158`	`continue`
`155`	`159`	`}`
`156`	`160`	`info := &FieldCacheEntry{JsonName: jsonName, isOmitEmpty: isOmitempty, fieldPath: append(fieldPath, field.Index), fieldType: field.Type}`