support non-pointer marshaling

Hǎiliàng Wáng · Hǎiliàng Wáng · commit e2e9406b4e3d · 2017-11-01T12:48:09.000+08:00
diff --git a/binary.go b/binary.go
@@ -104,10 +104,8 @@ func (b *Encoder) Encode(v interface{}) (err error) {
 			l := rv.NumField()
 			n := 0
 			for i := 0; i < l; i++ {
-				if v := rv.Field(i); v.CanSet() && t.Field(i).Name != "_" {
-					// take the address of the field, so structs containing structs
-					// are correctly encoded.
-					if err = b.Encode(v.Addr().Interface()); err != nil {
+				if v := rv.Field(i); t.Field(i).Name != "_" {
+					if err = b.Encode(v.Interface()); err != nil {
 						return
 					}
 					n++
diff --git a/binary_test.go b/binary_test.go
@@ -258,6 +258,24 @@ func TestSliceOfStructWithStruct(t *testing.T) {
 
 }
 
+func TestMarshalNonPointer(t *testing.T) {
+	type S struct {
+		A int
+	}
+	s := S{A: 1}
+	data, err := Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var res S
+	if err := Unmarshal(data, &res); err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(res, s) {
+		t.Fatalf("expect %v got %v", s, res)
+	}
+}
+
 func BenchmarkEncodeStructI1(b *testing.B) {
 	type Struct struct {
 		S struct {
