qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 10:54:49 -07:00
Code Releases Activity

fmt: set p.field before nil check

Browse Source 
Fixes #3752.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6331062
This commit is contained in:
Rob Pike 2012-06-25 16:48:20 -07:00
parent d1537809ba
commit a308be5fa8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/fmt/fmt_test.go
View File

@ -851,3 +851,15 @@ func TestIsSpace(t *testing.T) {
} }
} }
} }
func TestNilDoesNotBecomeTyped(t *testing.T) {
type A struct{}
type B struct{}
var a *A = nil
var b B = B{}
got := Sprintf("%s %s %s %s %s", nil, a, nil, b, nil)
const expect = "%!s(<nil>) %!s(*fmt_test.A=<nil>) %!s(<nil>) {} %!s(<nil>)"
if got != expect {
t.Errorf("expected:\n\t%q\ngot:\n\t%q", expect, got)
}
}

5
src/pkg/fmt/print.go
View File

@ -712,6 +712,9 @@ func (p *pp) handleMethods(verb rune, plus, goSyntax bool, depth int) (wasString
} }
func (p *pp) printField(field interface{}, verb rune, plus, goSyntax bool, depth int) (wasString bool) { func (p *pp) printField(field interface{}, verb rune, plus, goSyntax bool, depth int) (wasString bool) {
p.field = field
p.value = reflect.Value{}
if field == nil { if field == nil {
if verb == 'T' || verb == 'v' { if verb == 'T' || verb == 'v' {
p.buf.Write(nilAngleBytes) p.buf.Write(nilAngleBytes)
@ -721,8 +724,6 @@ func (p *pp) printField(field interface{}, verb rune, plus, goSyntax bool, depth
return false return false
} }
p.field = field
p.value = reflect.Value{}
// Special processing considerations. // Special processing considerations.
// %T (the value's type) and %p (its address) are special; we always do them first. // %T (the value's type) and %p (its address) are special; we always do them first.
switch verb { switch verb {