From 8bb628dd7235e638c5cb0318a036221a3a43f419 Mon Sep 17 00:00:00 2001 From: David Symonds Date: Tue, 22 Jul 2014 13:49:35 +1000 Subject: goprotobuf: Fix test for text format number too large for int64. LGTM=nigeltao R=nigeltao CC=golang-codereviews https://codereview.appspot.com/111460043 --- proto/text_parser.go | 2 ++ 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 -- cgit v1.2.3