mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-01-30 03:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

proto: fix equality on nil values of different types

Browse Source 
Equal((*M1)(nil), (*M2)(nil)) should be false.

Change-Id: I7def8016fcf1e78d9e69f79c23ab44fc3d211bb0
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/213479
Reviewed-by: Joe Tsai <joetsai@google.com>
This commit is contained in:
Damien Neil 2020-01-06 15:12:19 -08:00
parent 2244bc5833
commit 2ad3f248e2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proto/equal.go
View File

@ -35,8 +35,8 @@ func Equal(x, y Message) bool {
}
mx := x.ProtoReflect()
my := y.ProtoReflect()
if !mx.IsValid() || !my.IsValid() {
return !mx.IsValid() && !my.IsValid()
if mx.IsValid() != my.IsValid() {
return false
}
return equalMessage(mx, my)
}

15
proto/equal_test.go
View File

@ -41,6 +41,21 @@ func TestEqual(t *testing.T) {
y: new(testpb.TestAllTypes),
eq: true,
},
{
x: (*testpb.TestAllTypes)(nil),
y: (*testpb.TestAllExtensions)(nil),
eq: false,
},
{
x: (*testpb.TestAllTypes)(nil),
y: new(testpb.TestAllExtensions),
eq: false,
},
{
x: new(testpb.TestAllTypes),
y: new(testpb.TestAllExtensions),
eq: false,
},
// Proto2 scalars.
{