Skip to content

MapTo: error on nil struct pointer instead of panic #392

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

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

MapTo: error on nil struct pointer instead of panic #392

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,13 +381,21 @@ func (s *Section) mapToSlice(secName string, val reflect.Value, isStrict bool) (
func (s *Section) mapTo(v interface{}, isStrict bool) error {
typ := reflect.TypeOf(v)
val := reflect.ValueOf(v)
if typ == nil || !val.IsValid() {
return errors.New("nil pointer to a struct")
}
if typ.Kind() == reflect.Pointer {
typ = typ.Elem()
val = val.Elem()
} else {
return errors.New("not a pointer to a struct")
}

// MapTo(&cfg) where cfg is a nil *T used to panic in mapToField (#369).
if !val.IsValid() || (val.Kind() == reflect.Pointer && val.IsNil()) {
return errors.New("nil pointer to a struct")
}

if typ.Kind() == reflect.Slice {
newField, err := s.mapToSlice(s.name, val, isStrict)
if err != nil {
Expand Down
14 changes: 14 additions & 0 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,3 +910,17 @@ Title = Consultant Engineer
)
})
}

func TestMapToNilStructPointer(t *testing.T) {
t.Run("nil pointer to struct", func(t *testing.T) {
type Config struct {
User string `ini:"user"`
Pass string `ini:"pass"`
}
var cfg *Config
f, err := Load([]byte("user = alice\npass = secret\n"))
require.NoError(t, err)
err = f.MapTo(&cfg)
assert.EqualError(t, err, "nil pointer to a struct")
})
}