code review 12387043: html/template: handle nils during indirection

html/template: handle nils during indirection

Fixes issue 5982.

[josharian, 2013-08-03 01:12:25]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go

[r, 2013-08-03 21:59:54]

https://codereview.appspot.com/12387043/diff/6001/src/pkg/html/template/conte...
File src/pkg/html/template/content_test.go (right):

https://codereview.appspot.com/12387043/diff/6001/src/pkg/html/template/conte...
src/pkg/html/template/content_test.go:267: defer func() {
you don't need to do this. if it panics, the test is broken and that's enough.

https://codereview.appspot.com/12387043/diff/6001/src/pkg/html/template/conte...
src/pkg/html/template/content_test.go:283: if !bytes.Equal(want.Bytes(),
got.Bytes()) {
if you use want.String() here the code is a lot shorter.

[josharian, 2013-08-03 22:33:43]

Hello golang-dev@googlegroups.com, r@golang.org (cc:
golang-dev@googlegroups.com),

Please take another look.

[r, 2013-08-03 22:38:08]

LGTM

https://codereview.appspot.com/12387043/diff/16001/src/pkg/html/template/cont...
File src/pkg/html/template/content_test.go (right):

https://codereview.appspot.com/12387043/diff/16001/src/pkg/html/template/cont...
src/pkg/html/template/content_test.go:265: tmpl :=
Must(New("TestEscapingNilNonemptyInterfaces").Parse("{{.E}}"))
the name "x" would serve just fine.

[josharian, 2013-08-03 22:39:43]

> you don't need to do this. if it panics, the test is broken and that's enough.

Thanks. I found some instances of catching panics and turning them into test
failures in net, so I wasn't sure what the preferred way was.


>
https://codereview.appspot.com/12387043/diff/6001/src/pkg/html/template/conte...
> src/pkg/html/template/content_test.go:283: if !bytes.Equal(want.Bytes(),
> got.Bytes()) {
> if you use want.String() here the code is a lot shorter.

Yep! I wasn't sure whether to rely on the stability of the string
representation, but I'm +1 on shorter code. Fixed. :)


-josh

[r, 2013-08-03 22:41:25]

*** Submitted as https://code.google.com/p/go/source/detail?r=d20b285974a4 ***

html/template: handle nils during indirection

Fixes issue 5982.

R=golang-dev, r
CC=golang-dev
https://codereview.appspot.com/12387043

Committer: Rob Pike <r@golang.org>