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

internal/legacy: use proto.Unmarshal from v2

Browse Source 
Change-Id: Ic1e757a11f233657d6c3a840719ebef34d81e4f5
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167716
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Joe Tsai 2019-03-14 14:06:05 -07:00 committed by Joe Tsai
parent f83d5bb6f0
commit 69996ba400
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/legacy/file.go
View File

@ -56,9 +56,8 @@ func loadFileDesc(b []byte) *descriptorpb.FileDescriptorProto {
if err != nil {
panic(err)
}
// TODO: What about extensions?
// The protoV1 API does not eagerly unmarshal extensions.
if err := proto.Unmarshal(b, m); err != nil {
err = proto.UnmarshalOptions{DiscardUnknown: true}.Unmarshal(b, m)
if err != nil {
panic(err)
}
fileDescCache.Store(&b[0], m)