| commit | 69996ba4009c882ae599539f6a103a4b229a0573 | [log] [tgz] |
|---|---|---|
| author | Joe Tsai <joetsai@digital-static.net> | Thu Mar 14 14:06:05 2019 -0700 |
| committer | Joe Tsai <thebrokentoaster@gmail.com> | Thu Mar 14 21:46:02 2019 +0000 |
| tree | eb33a36ef8e6947041e85a85f051e540ed18f598 | |
| parent | f83d5bb6f094c2e3daeb579001316a7dee734eb1 [diff] |
internal/legacy: use proto.Unmarshal from v2 Change-Id: Ic1e757a11f233657d6c3a840719ebef34d81e4f5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167716 Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/legacy/file.go b/internal/legacy/file.go index d2a75c4..5c79810 100644 --- a/internal/legacy/file.go +++ b/internal/legacy/file.go
@@ -56,9 +56,8 @@ 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)