Fix parsing negative JSON values for uint32 fields (#839)

Sync of cl/538436650
google · Jun 9, 2023 · edf8e92 · edf8e92
1 parent 2931b2e
commit edf8e92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
@@ -22,6 +22,7 @@
   (`mergeFromBuffer`, `mergeFromProto3Json`, ...). ([#489], [#727])
 * Fix handling `null` values in proto3 JSON deserializer. ([#751], [#760],
   [#763])
+* Fix handling negative JSON values when parsing uint32 fields. ([#839])
 
 [#183]: https://github.com/google/protobuf.dart/issues/183
 [#644]: https://github.com/google/protobuf.dart/pull/644
@@ -43,6 +44,7 @@
 [#760]: https://github.com/google/protobuf.dart/issues/760
 [#763]: https://github.com/google/protobuf.dart/pull/763
 [#754]: https://github.com/google/protobuf.dart/pull/754
+[#839]: https://github.com/google/protobuf.dart/pull/839
 
 ## 2.1.0
 

diff --git a/protobuf/lib/src/protobuf/json.dart b/protobuf/lib/src/protobuf/json.dart
@@ -249,12 +249,12 @@ dynamic _convertJsonValue(BuilderInfo meta, _FieldSet fs, value, int tagNumber,
       break;
     case PbFieldType._INT32_BIT:
     case PbFieldType._SINT32_BIT:
-    case PbFieldType._UINT32_BIT:
     case PbFieldType._SFIXED32_BIT:
       if (value is int) return value;
       if (value is String) return int.parse(value);
       expectedType = 'int or stringified int';
       break;
+    case PbFieldType._UINT32_BIT:
     case PbFieldType._FIXED32_BIT:
       int? validatedValue;
       if (value is int) validatedValue = value;

diff --git a/protoc_plugin/test/json_test.dart b/protoc_plugin/test/json_test.dart
@@ -174,6 +174,13 @@ void main() {
     expect(message.count, 2214672939);
   });
 
+  test('testUint32Negative', () {
+    var message = foo.Inner.fromJson('{"6": -1}');
+    expect(message.countUint32, 4294967295);
+    message = foo.Inner.fromJson('{"6": -2080294357}');
+    expect(message.countUint32, 2214672939);
+  });
+
   test('testParse', () {
     expect(TestAllTypes.fromJson(testAllJsonTypes), getAllSet());
   });

diff --git a/protoc_plugin/test/protos/foo.proto b/protoc_plugin/test/protos/foo.proto
@@ -28,6 +28,7 @@ message Inner {
   repeated string strings = 3;
   optional Inner inner = 4;
   optional fixed32 count = 5;
+  optional uint32 count_uint32 = 6;
 }
 
 extend Outer {