diff options
| author | Rob Pike <r@golang.org> | 2021-10-24 15:44:15 +1100 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2021-10-29 02:12:05 +0000 |
| commit | d3d8852d8997a6429cbd498138908e537869a6ef (patch) | |
| tree | 1cd0b6b533de0c6ccf5aad44eb2c56ebfe2373d9 /src/text/template/exec.go | |
| parent | 33c392f72d16163eb0795b3d61b2196ac21e1799 (diff) | |
| download | go-d3d8852d8997a6429cbd498138908e537869a6ef.tar.xz | |
text/template: use reflect.Value.FieldByIndexErr
to avoid a crash on a nil pointer as an embedded field.
Fixes #48215
Change-Id: I214faa6e3cf08cdec1c01035e4bbca0900c6a408
Reviewed-on: https://go-review.googlesource.com/c/go/+/357963
Trust: Rob Pike <r@golang.org>
Run-TryBot: Rob Pike <r@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/text/template/exec.go')
| -rw-r--r-- | src/text/template/exec.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/text/template/exec.go b/src/text/template/exec.go index 7e44497530..c42cbb2ad3 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -635,10 +635,13 @@ func (s *state) evalField(dot reflect.Value, fieldName string, node parse.Node, case reflect.Struct: tField, ok := receiver.Type().FieldByName(fieldName) if ok { - field := receiver.FieldByIndex(tField.Index) + field, err := receiver.FieldByIndexErr(tField.Index) if !tField.IsExported() { s.errorf("%s is an unexported field of struct type %s", fieldName, typ) } + if err != nil { + s.errorf("%v", err) + } // If it's a function, we must call it. if hasArgs { s.errorf("%s has arguments but cannot be invoked as function", fieldName) |