mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
encoding/json: make error capture logic in recover more type safe
Rather than only ignoring runtime.Error panics, which are a very narrow set of possible panic values, switch it such that the json package only captures panic values that have been properly wrapped in a jsonError struct. This ensures that only intentional panics originating from the json package are captured. Fixes #23012 Change-Id: I5e85200259edd2abb1b0512ce6cc288849151a6d Reviewed-on: https://go-review.googlesource.com/94019 Run-TryBot: Joe Tsai <thebrokentoaster@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
70a04f6880
commit
91a6a2a30f
4 changed files with 43 additions and 12 deletions
|
|
@ -2166,3 +2166,17 @@ func TestUnmarshalEmbeddedPointerUnexported(t *testing.T) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
type unmarshalPanic struct{}
|
||||
|
||||
func (unmarshalPanic) UnmarshalJSON([]byte) error { panic(0xdead) }
|
||||
|
||||
func TestUnmarshalPanic(t *testing.T) {
|
||||
defer func() {
|
||||
if got := recover(); !reflect.DeepEqual(got, 0xdead) {
|
||||
t.Errorf("panic() = (%T)(%v), want 0xdead", got, got)
|
||||
}
|
||||
}()
|
||||
Unmarshal([]byte("{}"), &unmarshalPanic{})
|
||||
t.Fatalf("Unmarshal should have panicked")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue