From c578ce65c4f73d93baa2439e26c6161908237422 Mon Sep 17 00:00:00 2001 From: kennytm Date: Tue, 27 Oct 2026 16:04:57 +0800 Subject: [PATCH] compatible_shim: additionally clear e.args on UnmarshalJSON() --- compatible_shim.go | 5 ++++ compatible_shim_test.go | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 compatible_shim_test.go diff --git a/compatible_shim.go b/compatible_shim.go index 0835a0cd..8999d530 100644 --- a/compatible_shim.go +++ b/compatible_shim.go @@ -94,5 +94,10 @@ func (e *Error) UnmarshalJSON(data []byte) error { } e.code = ErrCode(tErr.Code) e.message = tErr.Msg + e.args = nil + e.cause = nil + e.redactArgsPos = nil + e.file = "" + e.line = 0 return nil } diff --git a/compatible_shim_test.go b/compatible_shim_test.go new file mode 100644 index 00000000..1ba9ed8d --- /dev/null +++ b/compatible_shim_test.go @@ -0,0 +1,58 @@ +package errors + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestUnmarshalJSONClearsLocalState(t *testing.T) { + e := Error{ + message: "old %s", + args: []any{"secret"}, + cause: New("old cause"), + redactArgsPos: []int{0}, + file: "old.go", + line: 42, + } + const message = "literal %s, %1000000[1]d, 95% full" + require.NoError(t, e.UnmarshalJSON([]byte(`{"class":6,"code":123,"message":"`+message+`","rfccode":"executor:123"}`))) + require.Empty(t, e.Args()) + require.Equal(t, message, e.GetMsg()) + require.Equal(t, Error{ + code: 123, + codeText: "executor:123", + message: message, + }, e) + + data, err := json.Marshal(&e) + require.NoError(t, err) + var decoded jsonError + require.NoError(t, json.Unmarshal(data, &decoded)) + require.Equal(t, message, decoded.Msg) +} + +func TestUnmarshalJSONInvalidInputPreservesError(t *testing.T) { + for _, input := range []string{ + `{"message":"new message",`, + `{"message":"new message","code":"invalid"}`, + } { + t.Run(input, func(t *testing.T) { + e := Error{ + code: 123, + codeText: "executor:123", + message: "old %s", + args: []any{"secret"}, + cause: New("old cause"), + redactArgsPos: []int{0}, + file: "old.go", + line: 42, + } + before := e + require.Error(t, e.UnmarshalJSON([]byte(input))) + require.Equal(t, before, e) + require.Equal(t, "old secret", e.GetMsg()) + }) + } +}