diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-04-14 20:27:45 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-14 20:27:45 -0700 |
commit | e67ef3d449011c7923cf4c1e4b205ebd0d6f2167 (patch) | |
tree | 4c61ab7d12d62aae7f690deefda827abeb7cb6e8 | |
parent | 800e986012f43512416cc960a3072642a393073a (diff) | |
download | protobuf-e67ef3d449011c7923cf4c1e4b205ebd0d6f2167.tar.gz protobuf-e67ef3d449011c7923cf4c1e4b205ebd0d6f2167.tar.bz2 protobuf-e67ef3d449011c7923cf4c1e4b205ebd0d6f2167.zip |
Bugfix for JSON error case.
-rw-r--r-- | conformance/failure_list_ruby.txt | 2 | ||||
-rw-r--r-- | ruby/ext/google/protobuf_c/upb.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/conformance/failure_list_ruby.txt b/conformance/failure_list_ruby.txt index ade0ff4c..7c12da06 100644 --- a/conformance/failure_list_ruby.txt +++ b/conformance/failure_list_ruby.txt @@ -80,7 +80,6 @@ JsonInput.Int32FieldMaxFloatValue.JsonOutput JsonInput.Int32FieldMaxFloatValue.ProtobufOutput JsonInput.Int32FieldMinFloatValue.JsonOutput JsonInput.Int32FieldMinFloatValue.ProtobufOutput -JsonInput.Int32FieldMinValue.JsonOutput JsonInput.Int32FieldStringValue.JsonOutput JsonInput.Int32FieldStringValue.ProtobufOutput JsonInput.Int32FieldStringValueEscaped.JsonOutput @@ -125,7 +124,6 @@ JsonInput.OptionalUint64Wrapper.ProtobufOutput JsonInput.OptionalWrapperTypesWithNonDefaultValue.JsonOutput JsonInput.OptionalWrapperTypesWithNonDefaultValue.ProtobufOutput JsonInput.OriginalProtoFieldName.JsonOutput -JsonInput.OriginalProtoFieldName.ProtobufOutput JsonInput.PrimitiveRepeatedField.JsonOutput JsonInput.PrimitiveRepeatedField.ProtobufOutput JsonInput.RepeatedBoolWrapper.JsonOutput diff --git a/ruby/ext/google/protobuf_c/upb.c b/ruby/ext/google/protobuf_c/upb.c index eac19f71..212f1e0e 100644 --- a/ruby/ext/google/protobuf_c/upb.c +++ b/ruby/ext/google/protobuf_c/upb.c @@ -11624,7 +11624,7 @@ _again: #line 1270 "upb/json/parser.rl" if (p != pe) { - upb_status_seterrf(&parser->status, "Parse error at '%.*s'\n", p, pe - p); + upb_status_seterrf(&parser->status, "Parse error at '%.*s'\n", pe - p, p); upb_env_reporterror(parser->env, &parser->status); } else { capture_suspend(parser, &p); |