diff options
| author | David Symonds <dsymonds@golang.org> | 2014-07-22 13:49:35 +1000 |
|---|---|---|
| committer | David Symonds <dsymonds@golang.org> | 2014-07-22 13:49:35 +1000 |
| commit | 8bb628dd7235e638c5cb0318a036221a3a43f419 (patch) | |
| tree | 03ec3d4e18c3262f50b01ff96611329de557d85d | |
| parent | baeae8bcd1d3c1195b85619b5e455fc8428d2faa (diff) | |
| download | protobuf-8bb628dd7235e638c5cb0318a036221a3a43f419.tar.gz | |
goprotobuf: Fix test for text format number too large for int64.
LGTM=nigeltao
R=nigeltao
CC=golang-codereviews
https://codereview.appspot.com/111460043
| -rw-r--r-- | proto/text_parser.go | 2 | ||||
| -rw-r--r-- | proto/text_parser_test.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/proto/text_parser.go b/proto/text_parser.go index 4d4167c..d235ca9 100644 --- a/proto/text_parser.go +++ b/proto/text_parser.go @@ -612,6 +612,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) *ParseError { fv.SetInt(x) return nil } + if len(props.Enum) == 0 { break } @@ -630,6 +631,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) *ParseError { fv.SetInt(x) return nil } + case reflect.Ptr: // A basic field (indirected through pointer), or a repeated message/group p.back() diff --git a/proto/text_parser_test.go b/proto/text_parser_test.go index e447ffa..d043769 100644 --- a/proto/text_parser_test.go +++ b/proto/text_parser_test.go @@ -156,8 +156,8 @@ var unMarshalTextTests = []UnmarshalTextTest{ // Number too large for int64 { - in: "count: 123456789012345678901", - err: "line 1.7: invalid int32: 123456789012345678901", + in: "count: 1 others { key: 123456789012345678901 }", + err: "line 1.23: invalid int64: 123456789012345678901", }, // Number too large for int32 |