Merge branch 'pr/110'

GODRIVER-675
GODRIVER-676

Change-Id: Ibb3f16d108b177ce6b31e6f7b3b4b741dc779c2b

Author: skriptble

bson/bsoncodec/struct_codec.go

@@ -222,7 +222,7 @@ func (sc *StructCodec) isZero(i interface{}) bool {
 		return true
 	}
 
-	if z, ok := v.Interface().(Zeroer); ok {
+	if z, ok := v.Interface().(Zeroer); ok && (v.Kind() != reflect.Ptr || !v.IsNil()) {
 		return z.IsZero()
 	}
 

bson/bsoncodec/struct_codec_test.go

@@ -8,6 +8,7 @@ package bsoncodec
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -35,4 +36,12 @@ func TestZeoerInterfaceUsedByDecoder(t *testing.T) {
 
 	z.reportZero = true
 	assert.True(t, enc.isZero(z))
+
+	// *time.Time with nil should be zero
+	var tp *time.Time
+	assert.True(t, enc.isZero(tp))
+
+	// actually all zeroer if nil should also be zero
+	var zp *zeroTest
+	assert.True(t, enc.isZero(zp))
 }