Merge branch 'pr/66'

Change-Id: Ib8440fea4c402ac40ccf8a18b79ae564b3bfdaea

Author: skriptble

bson/encode.go

@@ -445,7 +445,11 @@ func (e *encoder) encodeSliceAsArray(rval reflect.Value, minsize bool) ([]*Value
 			vals = append(vals, VC.DateTime(convertTimeToInt64(t)))
 			continue
 		case *time.Time:
-			vals = append(vals, VC.DateTime(convertTimeToInt64(*t)))
+			if t == nil {
+				vals = append(vals, VC.Null())
+			} else {
+				vals = append(vals, VC.DateTime(convertTimeToInt64(*t)))
+			}
 			continue
 		}
 
@@ -531,7 +535,11 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 			elems = append(elems, EC.DateTime(key, convertTimeToInt64(t)))
 			continue
 		case *time.Time:
-			elems = append(elems, EC.DateTime(key, convertTimeToInt64(*t)))
+			if t == nil {
+				elems = append(elems, EC.Null(key))
+			} else {
+				elems = append(elems, EC.DateTime(key, convertTimeToInt64(*t)))
+			}
 			continue
 		}
 		field = e.underlyingVal(field)

bson/encode_test.go

@@ -1100,6 +1100,23 @@ func TestZeoerInterfaceUsedByDecoder(t *testing.T) {
 
 }
 
+type timePrtStruct struct { TimePtrField *time.Time }
+func TestRegressionNoDereferenceNilTimePtr (t *testing.T) {
+	enc := &encoder{}
+
+	assert.NotPanics(t, func () {
+		res, err := enc.encodeStruct(reflect.ValueOf(timePrtStruct{}))
+		assert.Len(t, res, 1)
+		assert.Nil(t, err)
+	})
+
+	assert.NotPanics(t, func () {
+		res, err := enc.encodeSliceAsArray(reflect.ValueOf([]*time.Time{nil, nil, nil}), false)
+		assert.Len(t, res, 3)
+		assert.Nil(t, err)
+	})
+}
+
 func docToBytes(d *Document) []byte {
 	b, err := d.MarshalBSON()
 	if err != nil {