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

encoding/jsonpb: fix parsing of number strings containing leading/trailing spaces

Browse Source 
Per conformance tests, number strings that contain leading or trailing
spaces are not allowed.

3a3956e8a2/conformance/binary_json_conformance_suite.cc (L1196-L1203)

Change-Id: Ifbe0e4ee125fac3c291b456eece541353025cdd4
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/173664
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
This commit is contained in:
Herbie Ong 2019-04-24 21:15:45 -07:00
parent ad9c125737
commit 06a6b0bda8
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
encoding/jsonpb/decode.go
View File

@ -376,7 +376,11 @@ func unmarshalInt(jval json.Value, bitSize int) (pref.Value, error) {
case json.String: case json.String:
// Decode number from string. // Decode number from string.
dec := json.NewDecoder([]byte(jval.String())) s := strings.TrimSpace(jval.String())
if len(s) != len(jval.String()) {
return pref.Value{}, errors.New("invalid number %v", jval.Raw())
}
dec := json.NewDecoder([]byte(s))
var nerr errors.NonFatal var nerr errors.NonFatal
jval, err := dec.Read() jval, err := dec.Read()
if !nerr.Merge(err) { if !nerr.Merge(err) {
@ -405,7 +409,11 @@ func unmarshalUint(jval json.Value, bitSize int) (pref.Value, error) {
case json.String: case json.String:
// Decode number from string. // Decode number from string.
dec := json.NewDecoder([]byte(jval.String())) s := strings.TrimSpace(jval.String())
if len(s) != len(jval.String()) {
return pref.Value{}, errors.New("invalid number %v", jval.Raw())
}
dec := json.NewDecoder([]byte(s))
var nerr errors.NonFatal var nerr errors.NonFatal
jval, err := dec.Read() jval, err := dec.Read()
if !nerr.Merge(err) { if !nerr.Merge(err) {
@ -452,6 +460,9 @@ func unmarshalFloat(jval json.Value, bitSize int) (pref.Value, error) {
return pref.ValueOf(math.Inf(-1)), nil return pref.ValueOf(math.Inf(-1)), nil
} }
// Decode number from string. // Decode number from string.
if len(s) != len(strings.TrimSpace(s)) {
return pref.Value{}, errors.New("invalid number %v", jval.Raw())
}
dec := json.NewDecoder([]byte(s)) dec := json.NewDecoder([]byte(s))
var nerr errors.NonFatal var nerr errors.NonFatal
jval, err := dec.Read() jval, err := dec.Read()

20
encoding/jsonpb/decode_test.go
View File

@ -252,6 +252,16 @@ func TestUnmarshal(t *testing.T) {
SFloat: float32(math.Inf(+1)), SFloat: float32(math.Inf(+1)),
SDouble: math.Inf(-1), SDouble: math.Inf(-1),
}, },
}, {
desc: "float string with leading space",
inputMessage: &pb3.Scalars{},
inputText: `{"sFloat": " 1.234"}`,
wantErr: true,
}, {
desc: "double string with trailing space",
inputMessage: &pb3.Scalars{},
inputText: `{"sDouble": "5.678 "}`,
wantErr: true,
}, { }, {
desc: "not float", desc: "not float",
inputMessage: &pb3.Scalars{}, inputMessage: &pb3.Scalars{},
@ -323,6 +333,16 @@ func TestUnmarshal(t *testing.T) {
wantMessage: &pb3.Scalars{ wantMessage: &pb3.Scalars{
SInt32: 12, SInt32: 12,
}, },
}, {
desc: "integer string with leading space",
inputMessage: &pb3.Scalars{},
inputText: `{"sInt32": " 1234"}`,
wantErr: true,
}, {
desc: "integer string with trailing space",
inputMessage: &pb3.Scalars{},
inputText: `{"sUint32": "1e2 "}`,
wantErr: true,
}, { }, {
desc: "number is not an integer", desc: "number is not an integer",
inputMessage: &pb3.Scalars{}, inputMessage: &pb3.Scalars{},