Prevent Printf crashing when giving an extra nil argument.

R=rsc, r CC=golang-dev https://golang.org/cl/1195041

Prevent Printf crashing when giving an extra nil argument.
R=rsc, r CC=golang-dev https://golang.org/cl/1195041
14e04f4d · Roger Peppe · Rob Pike · e0bde8cf · 14e04f4d
Commit 14e04f4d authored May 13, 2010 by Roger Peppe Committed by Rob Pike May 13, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/pkg/fmt/print.go src/pkg/fmt/print.go +4 -2

No files found.
--- a/src/pkg/fmt/print.go
+++ b/src/pkg/fmt/print.go
@@ -1053,8 +1053,10 @@ func (p *pp) doprintf(format string, a []interface{}) {
 		p.buf.Write(extraBytes)
 		for ; fieldnum < len(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)
 			if fieldnum+1 < len(a) {
 				p.buf.Write(commaSpaceBytes)