mirror of
https://github.com/yusing/godoxy.git
synced 2025-05-19 20:32:35 +02:00
fix: yaml unmarshal panic
This commit is contained in:
parent
c286275f7e
commit
57f80344bc
2 changed files with 3 additions and 3 deletions
|
@ -44,7 +44,7 @@ oauth2_config:
|
|||
}
|
||||
testYaml = testYaml[1:] // remove first \n
|
||||
opt := make(map[string]any)
|
||||
ExpectNoError(t, yaml.Unmarshal([]byte(testYaml), opt))
|
||||
ExpectNoError(t, yaml.Unmarshal([]byte(testYaml), &opt))
|
||||
ExpectNoError(t, utils.MapUnmarshalValidate(opt, cfg))
|
||||
ExpectEqual(t, cfg, cfgExpected)
|
||||
}
|
||||
|
|
|
@ -560,7 +560,7 @@ func ConvertString(src string, dst reflect.Value) (convertible bool, convErr gpe
|
|||
|
||||
func UnmarshalValidateYAML[T any](data []byte, target *T) gperr.Error {
|
||||
m := make(map[string]any)
|
||||
if err := yaml.Unmarshal(data, m); err != nil {
|
||||
if err := yaml.Unmarshal(data, &m); err != nil {
|
||||
return gperr.Wrap(err)
|
||||
}
|
||||
return MapUnmarshalValidate(m, target)
|
||||
|
@ -568,7 +568,7 @@ func UnmarshalValidateYAML[T any](data []byte, target *T) gperr.Error {
|
|||
|
||||
func UnmarshalValidateYAMLMap[V any](data []byte) (_ functional.Map[string, V], err gperr.Error) {
|
||||
m := make(map[string]any)
|
||||
if err = gperr.Wrap(yaml.Unmarshal(data, m)); err != nil {
|
||||
if err = gperr.Wrap(yaml.Unmarshal(data, &m)); err != nil {
|
||||
return
|
||||
}
|
||||
m2 := make(map[string]V, len(m))
|
||||
|
|
Loading…
Add table
Reference in a new issue