SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 11:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix badjson merge

Browse source
This commit is contained in:
世界 2024-02-22 17:24:48 +08:00
parent 5ee4f84faf
commit ef00a1ec1e
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/json/badjson/merge.go
View file

@ -93,6 +93,11 @@ func MergeJSON(rawSource json.RawMessage, rawDestination json.RawMessage) (json.
if err != nil {
return nil, E.Cause(err, "decode destination")
}
if source == nil {
return json.Marshal(destination)
} else if destination == nil {
return json.Marshal(source)
}
merged, err := mergeJSON(source, destination)
if err != nil {
return nil, err
@ -125,7 +130,7 @@ func mergeJSON(anySource any, anyDestination any) (any, error) {
destination.Put(entry.Key, entry.Value)
}
default:
return nil, E.New("cannot merge json object into ", reflect.TypeOf(destination))
return nil, E.New("cannot merge json object into ", reflect.TypeOf(source))
}
return destination, nil
default: