Skip to content

Commit

Permalink
Fix unmarshaling of nested non-exported struct (#917)
Browse files Browse the repository at this point in the history
Fixes #915
  • Loading branch information
pelletier committed Dec 11, 2023
1 parent 358c8d2 commit 34765b4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
6 changes: 3 additions & 3 deletions unmarshaler.go
Expand Up @@ -1097,9 +1097,9 @@ func (d *decoder) handleKeyValuePart(key unstable.Iterator, value *unstable.Node

f := fieldByIndex(v, path)

if !f.CanSet() {
// If the field is not settable, need to take a slower path and make a copy of
// the struct itself to a new location.
if !f.CanAddr() {
// If the field is not addressable, need to take a slower path and
// make a copy of the struct itself to a new location.
nvp := reflect.New(v.Type())
nvp.Elem().Set(v)
v = nvp.Elem()
Expand Down
22 changes: 22 additions & 0 deletions unmarshaler_test.go
Expand Up @@ -2801,6 +2801,28 @@ res = [
}
}

func TestIssue915(t *testing.T) {
type blah struct {
A string `toml:"a"`
}

type config struct {
Fizz string `toml:"fizz"`
blah `toml:"blah"`
}

b := []byte(`
fizz = "abc"
blah.a = "def"`)
var cfg config
err := toml.Unmarshal(b, &cfg)
require.NoError(t, err)

require.Equal(t, "abc", cfg.Fizz)
require.Equal(t, "def", cfg.blah.A)
require.Equal(t, "def", cfg.A)
}

func TestUnmarshalDecodeErrors(t *testing.T) {
examples := []struct {
desc string
Expand Down

0 comments on commit 34765b4

Please sign in to comment.