Merge pull request #328 from prochac/fix-issue-327

prevent panic in TextUnmarshallerHookFunc
mitchellh · Dec 16, 2023 · 8508981 · 8508981
2 parents bf980b3 + 63cde0d
commit 8508981
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/decode_hooks.go b/decode_hooks.go
@@ -271,7 +271,11 @@ func TextUnmarshallerHookFunc() DecodeHookFuncType {
 		if !ok {
 			return data, nil
 		}
-		if err := unmarshaller.UnmarshalText([]byte(data.(string))); err != nil {
+		str, ok := data.(string)
+		if !ok {
+			str = reflect.Indirect(reflect.ValueOf(&data)).Elem().String()
+		}
+		if err := unmarshaller.UnmarshalText([]byte(str)); err != nil {
 			return nil, err
 		}
 		return result, nil

diff --git a/decode_hooks_test.go b/decode_hooks_test.go
@@ -1,6 +1,7 @@
 package mapstructure
 
 import (
+	"encoding/json"
 	"errors"
 	"math/big"
 	"net"
@@ -542,6 +543,8 @@ func TestStructToMapHookFuncTabled(t *testing.T) {
 }
 
 func TestTextUnmarshallerHookFunc(t *testing.T) {
+	type MyString string
+
 	cases := []struct {
 		f, t   reflect.Value
 		result interface{}
@@ -550,8 +553,9 @@ func TestTextUnmarshallerHookFunc(t *testing.T) {
 		{reflect.ValueOf("42"), reflect.ValueOf(big.Int{}), big.NewInt(42), false},
 		{reflect.ValueOf("invalid"), reflect.ValueOf(big.Int{}), nil, true},
 		{reflect.ValueOf("5"), reflect.ValueOf("5"), "5", false},
+		{reflect.ValueOf(json.Number("42")), reflect.ValueOf(big.Int{}), big.NewInt(42), false},
+		{reflect.ValueOf(MyString("42")), reflect.ValueOf(big.Int{}), big.NewInt(42), false},
 	}
-
 	for i, tc := range cases {
 		f := TextUnmarshallerHookFunc()
 		actual, err := DecodeHookExec(f, tc.f, tc.t)