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 panic that occurs when a struct has a blank field #175

Merged
merged 1 commit into from
Mar 3, 2021
Merged

Fix panic that occurs when a struct has a blank field #175

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
21 changes: 21 additions & 0 deletions issue174_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package mergo_test

import (
"testing"

"github.com/imdario/mergo"
)

type structWithBlankField struct {
_ struct{}
A struct{}
}

func TestIssue174(t *testing.T) {
dst := structWithBlankField{}
src := structWithBlankField{}

if err := mergo.Merge(&dst, src, mergo.WithOverride); err != nil {
t.Error(err)
}
}
2 changes: 1 addition & 1 deletion merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
}
}
} else {
if (isReflectNil(dst) || overwrite) && (!isEmptyValue(src) || overwriteWithEmptySrc) {
if dst.CanSet() && (isReflectNil(dst) || overwrite) && (!isEmptyValue(src) || overwriteWithEmptySrc) {
dst.Set(src)
}
}
Expand Down