Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix potential panic in getStructFields for non-pointer embedded fields #111

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix potential panic in getStructFields for non-pointer embedded fields #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions pkl/decode_struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,11 @@ func getStructFields(typ reflect.Type) map[string]structField {
field := typ.Field(i)
// embedded
if field.Anonymous {
for k, v := range getStructFields(field.Type.Elem()) {
fieldType := field.Type
if fieldType.Kind() == reflect.Pointer {
fieldType = fieldType.Elem()
}
for k, v := range getStructFields(fieldType) {
ret[k] = v
}
} else {
Expand All @@ -328,14 +332,22 @@ func (d *decoder) getOutputValue(typ reflect.Type) (*reflect.Value, error) {
for i := 0; i < numFields; i++ {
field := typ.Field(i)
if field.Anonymous {
fieldValue := reflect.New(field.Type.Elem())
// Assertion: all embedded fields are pointers to structs.
structValue, err := d.getOutputValue(field.Type.Elem())
fieldType := field.Type
isPointer := fieldType.Kind() == reflect.Pointer
if isPointer {
fieldType = fieldType.Elem()
}
fieldValue := reflect.New(fieldType)
structValue, err := d.getOutputValue(fieldType)
if err != nil {
return nil, err
}
fieldValue.Elem().Set(*structValue)
ret.FieldByName(field.Name).Set(fieldValue)
if isPointer {
ret.FieldByName(field.Name).Set(fieldValue)
} else {
ret.FieldByName(field.Name).Set(fieldValue.Elem())
}
}
}
return &ret, nil
Expand Down