Fix marshalling of empty oneOf messages

Fixes #61

Author: howardjohn

conformance/internal/conformance/fuzz_test.go

@@ -0,0 +1,58 @@
+package conformance
+
+import (
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/encoding/prototext"
+	"google.golang.org/protobuf/proto"
+	"strings"
+	"testing"
+)
+
+func roundTripUpstream(b []byte) ([]byte, error) {
+	msg := &TestAllTypesProto3{}
+	if err := proto.Unmarshal(b, msg); err != nil {
+		return nil, err
+	}
+	res, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func roundTripVtprotobuf(b []byte) ([]byte, error) {
+	msg := &TestAllTypesProto3{}
+	if err := msg.UnmarshalVT(b); err != nil {
+		return nil, err
+	}
+	res, err := msg.MarshalVT()
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func FuzzProto(f *testing.F) {
+	f.Fuzz(func(t *testing.T, b []byte) {
+		u, uerr := roundTripUpstream(b)
+		v, verr := roundTripVtprotobuf(b)
+		if verr != nil && strings.Contains(verr.Error(), "wrong wireType") {
+			t.Skip()
+		}
+		if uerr != nil && strings.Contains(uerr.Error(), "cannot parse invalid wire-format data") {
+			t.Skip()
+		}
+		if (uerr != nil) != (verr != nil) {
+			t.Fatalf("upstream err: %v (%v), vtprotobuf err: %v (%v)", uerr, u, verr, v)
+		}
+		vt := &TestAllTypesProto3{}
+		_ = vt.UnmarshalVT(b)
+		t.Logf("vtprotobuf: %v, %v", protojson.Format(vt), prototext.Format(vt))
+		us := &TestAllTypesProto3{}
+		_ = proto.Unmarshal(b, us)
+
+		t.Logf("upstream: %v, %v", protojson.Format(us), prototext.Format(us))
+		require.Equal(t, u, v)
+	})
+}

conformance/internal/conformance/oneof_test.go

@@ -0,0 +1,16 @@
+package conformance
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/proto"
+)
+
+func TestEmptyOneoff(t *testing.T) {
+	// Regression test for https://github.com/planetscale/vtprotobuf/issues/61
+	msg := &TestAllTypesProto3{OneofField: &TestAllTypesProto3_OneofNestedMessage{}}
+	upstream, _ := proto.Marshal(msg)
+	vt, _ := msg.MarshalVTStrict()
+	require.Equal(t, upstream, vt)
+}

conformance/internal/conformance/test_messages_proto2_vtproto.pb.go

@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\xe30$")

conformance/internal/conformance/test_messages_proto3_vtproto.pb.go

@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("8\xb30")

conformance/internal/conformance/testdata/fuzz/FuzzProto/2bbe66c82943d372

@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x80\xff\x000")

conformance/internal/conformance/testdata/fuzz/FuzzProto/df6d2595afa8403b

@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("X\xb30")

conformance/internal/conformance/testdata/fuzz/FuzzProto/f27b832b1ad734c3

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/planetscale/vtprotobuf/generator"
-
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -520,7 +519,12 @@ func (p *marshal) field(oneof bool, numGen *counter, field *protogen.Field) {
 	default:
 		panic("not implemented")
 	}
-	if repeated || nullable {
+	if oneof && field.Desc.Kind() == protoreflect.MessageKind && !field.Desc.IsMap() && !field.Desc.IsList() {
+		p.P("} else {")
+		p.P("i = protohelpers.EncodeVarint(dAtA, i, 0)")
+		p.encodeKey(fieldNumber, wireType)
+		p.P("}")
+	} else if repeated || nullable {
 		p.P(`}`)
 	}
 }
@@ -676,7 +680,7 @@ func (p *marshal) message(message *protogen.Message) {
 	p.P(`}`)
 	p.P()
 
-	//Generate MarshalToVT methods for oneof fields
+	// Generate MarshalToVT methods for oneof fields
 	for _, field := range message.Fields {
 		if field.Oneof == nil || field.Oneof.Desc.IsSynthetic() {
 			continue
@@ -709,7 +713,6 @@ func (p *marshal) marshalBackwardSize(varInt bool) {
 	if varInt {
 		p.encodeVarint(`size`)
 	}
-
 }
 
 func (p *marshal) marshalBackward(varName string, varInt bool, message *protogen.Message) {

conformance/internal/conformance/testdata/fuzz/FuzzProto/fde3fe3ca1ceac51

@@ -8,11 +8,10 @@ package size
 import (
 	"strconv"
 
+	"github.com/planetscale/vtprotobuf/generator"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/reflect/protoreflect"
-
-	"github.com/planetscale/vtprotobuf/generator"
 )
 
 func init() {
@@ -266,7 +265,9 @@ func (p *size) field(oneof bool, field *protogen.Field, sizeName string) {
 	default:
 		panic("not implemented")
 	}
-	if repeated || nullable {
+	if oneof && field.Desc.Kind() == protoreflect.MessageKind && !field.Desc.IsMap() && !field.Desc.IsList() {
+		p.P("} else { n += 3 }")
+	} else if repeated || nullable {
 		p.P(`}`)
 	}
 }
@@ -310,8 +311,6 @@ func (p *size) message(message *protogen.Message) {
 				}
 				p.P(`}`)
 			} else {
-				//if _, ok := oneofs[fieldname]; !ok {
-				//oneofs[fieldname] = struct{}{}
 				p.P(`if vtmsg, ok := m.`, fieldname, `.(interface{ SizeVT() int }); ok {`)
 				p.P(`n+=vtmsg.`, sizeName, `()`)
 				p.P(`}`)