From 6599450016244b9e3e074e87d7064219ee2e5cf8 Mon Sep 17 00:00:00 2001 From: Nodir Turakulov Date: Sat, 5 Sep 2015 23:16:49 -0700 Subject: text/template: perform value validity checks Check reflect.Value.IsValid() before calling other reflect.Value methods that panic on zero values. Added tests for cases with untyped nils. They panicked without these fixes. Removed a TODO. Fixes #12356 Change-Id: I9b5cbed26db09a0a7c36d99a93f8b9729899d51e Reviewed-on: https://go-review.googlesource.com/14340 Reviewed-by: Rob Pike --- src/text/template/exec.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/text/template/exec.go') diff --git a/src/text/template/exec.go b/src/text/template/exec.go index 6e46d054a8..625e9b54d6 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -135,8 +135,6 @@ func errRecover(errp *error) { *errp = err.Err // Strip the wrapper. case ExecError: *errp = err // Keep the wrapper. - case error: // TODO: This should never happen, but it does. Understand and/or fix. - *errp = err default: panic(e) } -- cgit v1.3-5-g9baa