From 026d9493a7485b82e201c77c2d87eea3e098c103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Wed, 8 Jan 2025 11:04:24 +0800 Subject: [PATCH] listable: Fix incorrect unmarshaling of null to []T{null} --- common/json/badoption/listable.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/json/badoption/listable.go b/common/json/badoption/listable.go index df02217..3d210e4 100644 --- a/common/json/badoption/listable.go +++ b/common/json/badoption/listable.go @@ -2,7 +2,6 @@ package badoption import ( "context" - E "github.com/sagernet/sing/common/exceptions" "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 { + if string(content) == "null" { + return nil + } var singleItem T err := json.UnmarshalContextDisallowUnknownFields(ctx, content, &singleItem) if err == nil {