clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 06:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent Printf crashing when giving an extra nil argument.

Browse Source 
R=rsc, r
CC=golang-dev
https://golang.org/cl/1195041
This commit is contained in:
Roger Peppe 2010-05-13 12:49:48 -07:00 committed by Rob Pike
parent e0bde8cfe8
commit 14e04f4d40
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1053,8 +1053,10 @@ func (p *pp) doprintf(format string, a []interface{}) {
p.buf.Write(extraBytes) p.buf.Write(extraBytes)
for ; fieldnum < len(a); fieldnum++ { for ; fieldnum < len(a); fieldnum++ {
field := a[fieldnum] field := a[fieldnum]
p.buf.WriteString(reflect.Typeof(field).String()) if field != nil {
p.buf.WriteByte('=') p.buf.WriteString(reflect.Typeof(field).String())
p.buf.WriteByte('=')
}
p.printField(field, false, false, 0) p.printField(field, false, false, 0)
if fieldnum+1 < len(a) { if fieldnum+1 < len(a) {
p.buf.Write(commaSpaceBytes) p.buf.Write(commaSpaceBytes)