diff options
| author | Alan Donovan <adonovan@google.com> | 2024-04-23 12:44:54 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-05-08 19:10:41 +0000 |
| commit | 69e75c8581e15328454bb6e2f1dc347f73616b37 (patch) | |
| tree | f0fabe495e978fb211ef909e4c4b8d8a4085d559 /src/runtime/testdata/testprog | |
| parent | 4513f1a1c1037574bfd94b8637329246f475a534 (diff) | |
| download | go-69e75c8581e15328454bb6e2f1dc347f73616b37.tar.xz | |
runtime: properly frame panic values in tracebacks
This CL causes the printing of panic values to ensure that all
newlines in the output are immediately followed by a tab, so
that there is no way for a maliciously crafted panic value to
fool a program attempting to parse the traceback into thinking
that the panic value is in fact a goroutine stack.
See https://github.com/golang/go/issues/64590#issuecomment-1932675696
+ release note
Updates #64590
Updates #63455
Change-Id: I5142acb777383c0c122779d984e73879567dc627
Reviewed-on: https://go-review.googlesource.com/c/go/+/581215
Auto-Submit: Alan Donovan <adonovan@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Diffstat (limited to 'src/runtime/testdata/testprog')
| -rw-r--r-- | src/runtime/testdata/testprog/crash.go | 6 | ||||
| -rw-r--r-- | src/runtime/testdata/testprog/panicprint.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/testdata/testprog/crash.go b/src/runtime/testdata/testprog/crash.go index 38c8f6a2fa..bdc395f652 100644 --- a/src/runtime/testdata/testprog/crash.go +++ b/src/runtime/testdata/testprog/crash.go @@ -77,7 +77,7 @@ func DoublePanic() { type exampleError struct{} func (e exampleError) Error() string { - panic("important error message") + panic("important multi-line\nerror message") } func ErrorPanic() { @@ -97,7 +97,7 @@ func DoubleErrorPanic() { type exampleStringer struct{} func (s exampleStringer) String() string { - panic("important stringer message") + panic("important multi-line\nstringer message") } func StringerPanic() { @@ -115,7 +115,7 @@ func DoubleStringerPanic() { } func StringPanic() { - panic("important string message") + panic("important multi-line\nstring message") } func NilPanic() { diff --git a/src/runtime/testdata/testprog/panicprint.go b/src/runtime/testdata/testprog/panicprint.go index c8deabe2ab..4ce958ba3d 100644 --- a/src/runtime/testdata/testprog/panicprint.go +++ b/src/runtime/testdata/testprog/panicprint.go @@ -31,7 +31,7 @@ func panicCustomComplex128() { } func panicCustomString() { - panic(MyString("Panic")) + panic(MyString("Panic\nline two")) } func panicCustomBool() { |