From: Roger Peppe <rogpeppe@gmail.com>
Date: Thu, 13 May 2010 19:49:48 +0000 (-0700)
Subject: Prevent Printf crashing when giving an extra nil argument.
X-Git-Tag: weekly.2010-05-27~87
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=14e04f4d40e6a8ab178b2831fa1b92c9fada47ab;p=gostls13.git

Prevent Printf crashing when giving an extra nil argument.

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

diff --git a/src/pkg/fmt/print.go b/src/pkg/fmt/print.go
index fb1c3f707d..15b7c51452 100644
--- 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())
-			p.buf.WriteByte('=')
+			if field != nil {
+				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)