From 7b8120b513628c94fcbe0427e6da6574bd47efd8 Mon Sep 17 00:00:00 2001 From: Roger Peppe Date: Thu, 13 May 2010 12:49:48 -0700 Subject: Prevent Printf crashing when giving an extra nil argument. R=rsc, r CC=golang-dev http://codereview.appspot.com/1195041 Committer: Rob Pike --- src/pkg/fmt/print.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pkg/fmt/print.go b/src/pkg/fmt/print.go index fb1c3f707..15b7c5145 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) -- cgit v1.2.3