TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-07-06 22:44:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: yaml unmarshal panic

Browse source
This commit is contained in:
yusing 2025-04-16 14:25:06 +08:00
parent c286275f7e
commit 57f80344bc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/autocert/provider_test/ovh_test.go
View file

@ -44,7 +44,7 @@ oauth2_config:
} }
testYaml = testYaml[1:] // remove first \n testYaml = testYaml[1:] // remove first \n
opt := make(map[string]any) 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)) ExpectNoError(t, utils.MapUnmarshalValidate(opt, cfg))
ExpectEqual(t, cfg, cfgExpected) ExpectEqual(t, cfg, cfgExpected)
} }

4
internal/utils/serialization.go
View file

@ -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 { func UnmarshalValidateYAML[T any](data []byte, target *T) gperr.Error {
m := make(map[string]any) 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 gperr.Wrap(err)
} }
return MapUnmarshalValidate(m, target) 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) { func UnmarshalValidateYAMLMap[V any](data []byte) (_ functional.Map[string, V], err gperr.Error) {
m := make(map[string]any) 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 return
} }
m2 := make(map[string]V, len(m)) m2 := make(map[string]V, len(m))