Avoid serializing unknown fields twice in reparseMessage (#840)

google · Jun 13, 2023 · 0d820ef · 0d820ef
1 parent edf8e92
commit 0d820ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
@@ -23,6 +23,7 @@
 * Fix handling `null` values in proto3 JSON deserializer. ([#751], [#760],
   [#763])
 * Fix handling negative JSON values when parsing uint32 fields. ([#839])
+* Avoid serializing unknown fields twice in `reparseMessage`. ([#840])
 
 [#183]: https://github.com/google/protobuf.dart/issues/183
 [#644]: https://github.com/google/protobuf.dart/pull/644
@@ -45,6 +46,7 @@
 [#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
+[#840]: https://github.com/google/protobuf.dart/pull/840
 
 ## 2.1.0
 

diff --git a/protobuf/lib/src/protobuf/extension_registry.dart b/protobuf/lib/src/protobuf/extension_registry.dart
@@ -118,9 +118,9 @@ T _reparseMessage<T extends GeneratedMessage>(
       }
     });
 
-    if (codedBufferWriter.toBuffer().isNotEmpty) {
-      ensureResult()
-          .mergeFromBuffer(codedBufferWriter.toBuffer(), extensionRegistry);
+    final buffer = codedBufferWriter.toBuffer();
+    if (buffer.isNotEmpty) {
+      ensureResult().mergeFromBuffer(buffer, extensionRegistry);
     }
   }