Merge pull request mitchellh#6 from go-viper/fix-string-to-slice

fix: StringToSliceHookFunc incorrectly triggered when parsing []byte
adriansmares · Dec 18, 2023 · 524a9c9 · 524a9c9
2 parents 69bb54a + eee8faa
commit 524a9c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/decode_hooks.go b/decode_hooks.go
@@ -104,11 +104,14 @@ func OrComposeDecodeHookFunc(ff ...DecodeHookFunc) DecodeHookFunc {
 // string to []string by splitting on the given sep.
 func StringToSliceHookFunc(sep string) DecodeHookFunc {
 	return func(
-		f reflect.Kind,
-		t reflect.Kind,
+		f reflect.Type,
+		t reflect.Type,
 		data interface{},
 	) (interface{}, error) {
-		if f != reflect.String || t != reflect.Slice {
+		if f.Kind() != reflect.String {
+			return data, nil
+		}
+		if t != reflect.SliceOf(f) {
 			return data, nil
 		}
 

diff --git a/decode_hooks_test.go b/decode_hooks_test.go
@@ -221,13 +221,14 @@ func TestStringToSliceHookFunc(t *testing.T) {
 	f := StringToSliceHookFunc(",")
 
 	strValue := reflect.ValueOf("42")
-	sliceValue := reflect.ValueOf([]byte("42"))
+	sliceValue := reflect.ValueOf([]string{"42"})
 	cases := []struct {
 		f, t   reflect.Value
 		result interface{}
 		err    bool
 	}{
-		{sliceValue, sliceValue, []byte("42"), false},
+		{sliceValue, sliceValue, []string{"42"}, false},
+		{reflect.ValueOf([]byte("42")), reflect.ValueOf([]byte{}), []byte("42"), false},
 		{strValue, strValue, "42", false},
 		{
 			reflect.ValueOf("foo,bar,baz"),