diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2016-12-28 21:18:36 +0000 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2016-12-28 21:18:36 +0000 |
| commit | 73ef85bc5db590c22689e11be20737a3dd88168f (patch) | |
| tree | fe393a6f0776bca1889b2113ab341a2922e25d10 /vendor/github.com/golang/protobuf/proto/text_parser.go | |
| parent | 9e573e571fe878ed32947cae5a6d43cb5d72d3bb (diff) | |
Update dependencies
Diffstat (limited to 'vendor/github.com/golang/protobuf/proto/text_parser.go')
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/text_parser.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go index 4fd0531..61f83c1 100644 --- a/vendor/github.com/golang/protobuf/proto/text_parser.go +++ b/vendor/github.com/golang/protobuf/proto/text_parser.go @@ -592,7 +592,11 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error { props = oop.Prop nv := reflect.New(oop.Type.Elem()) dst = nv.Elem().Field(0) - sv.Field(oop.Field).Set(nv) + field := sv.Field(oop.Field) + if !field.IsNil() { + return p.errorf("field '%s' would overwrite already parsed oneof '%s'", name, sv.Type().Field(oop.Field).Name) + } + field.Set(nv) } if !dst.IsValid() { return p.errorf("unknown field name %q in %v", name, st) |