Merge pull request #72856 from liggitt/nil-panic-propagation

Fix nil panic propagation

Kubernetes-commit: d1e5311922b18c3d0723b0d90a33cad97ed507a2
This commit is contained in:
Kubernetes Publisher 2019-01-12 09:27:43 -08:00
commit d55c9aeff1
4 changed files with 2035 additions and 2 deletions

2026
Godeps/Godeps.json generated Normal file

File diff suppressed because it is too large Load Diff

2
Godeps/OWNERS generated Normal file
View File

@ -0,0 +1,2 @@
approvers:
- dep-approvers

5
Godeps/Readme generated Normal file
View File

@ -0,0 +1,5 @@
This directory tree is generated automatically by godep.
Please do not edit.
See https://github.com/tools/godep for more information.

View File

@ -190,9 +190,9 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object,
buf := make([]byte, size)
buf = buf[:goruntime.Stack(buf, false)]
panicReason = strings.TrimSuffix(fmt.Sprintf("%v\n%s", panicReason, string(buf)), "\n")
// Propagate to parent goroutine
panicCh <- panicReason
}
// Propagate to parent goroutine
panicCh <- panicReason
}()
if result, err := fn(); err != nil {