mirror of
https://github.com/go-gitea/gitea
synced 2024-12-22 16:44:26 +00:00
Fix crash following ldap authentication update (#16447)
Unfortunately #16268 contained a terrible error, whereby there was a double indirection taken when unmarshalling the source data. This fatally breaks authentication configuration reading. Fix #16342 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
e417cca777
commit
fdb0e82148
@ -74,9 +74,9 @@ var (
|
|||||||
// possible that a Blob may gain an unwanted prefix of 0xff 0xfe.
|
// possible that a Blob may gain an unwanted prefix of 0xff 0xfe.
|
||||||
func jsonUnmarshalIgnoreErroneousBOM(bs []byte, v interface{}) error {
|
func jsonUnmarshalIgnoreErroneousBOM(bs []byte, v interface{}) error {
|
||||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||||
err := json.Unmarshal(bs, &v)
|
err := json.Unmarshal(bs, v)
|
||||||
if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe {
|
if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe {
|
||||||
err = json.Unmarshal(bs[2:], &v)
|
err = json.Unmarshal(bs[2:], v)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user