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

listable: Fix incorrect unmarshaling of null to []T{null}

Browse source
This commit is contained in:
世界 2025-01-08 11:04:24 +08:00
parent aa7d2543a3
commit 026d9493a7
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/json/badoption/listable.go
View file

@ -2,7 +2,6 @@ package badoption
import ( import (
"context" "context"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json" "github.com/sagernet/sing/common/json"
) )
@ -18,6 +17,9 @@ func (l Listable[T]) MarshalJSONContext(ctx context.Context) ([]byte, error) {
} }
func (l *Listable[T]) UnmarshalJSONContext(ctx context.Context, content []byte) error { func (l *Listable[T]) UnmarshalJSONContext(ctx context.Context, content []byte) error {
if string(content) == "null" {
return nil
}
var singleItem T var singleItem T
err := json.UnmarshalContextDisallowUnknownFields(ctx, content, &singleItem) err := json.UnmarshalContextDisallowUnknownFields(ctx, content, &singleItem)
if err == nil { if err == nil {