Make Java-lite reject unmatched end-group tag.

This brings it into conformance with our spec and other languages. PiperOrigin-RevId: 700829684
protocolbuffers · Nov 28, 2024 · 3e88dba · 3e88dba
1 parent d59a9e1
commit 3e88dba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/conformance/failure_list_java_lite.txt b/conformance/failure_list_java_lite.txt
@@ -6,7 +6,3 @@
 
 Required.*.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE                               # Should have failed to parse, but didn't.
 Required.*.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE                                  # Should have failed to parse, but didn't.
-Required.*.ProtobufInput.UnmatchedEndGroup                                                                         # Should have failed to parse, but didn't.
-Required.*.ProtobufInput.UnmatchedEndGroupUnknown                                                                  # Should have failed to parse, but didn't.
-Required.*.ProtobufInput.UnmatchedEndGroupWithData                                                                 # Should have failed to parse, but didn't.
-Required.*.ProtobufInput.UnmatchedEndGroupWrongType                                                                # Should have failed to parse, but didn't.
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java b/java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java
@@ -93,6 +93,9 @@ final boolean mergeOneFieldFrom(B unknownFields, Reader reader, int currentDepth
         addGroup(unknownFields, fieldNumber, toImmutable(subFields));
         return true;
       case WireFormat.WIRETYPE_END_GROUP:
+        if (currentDepth == 0) {
+          throw InvalidProtocolBufferException.invalidEndTag();
+        }
         return false;
       default:
         throw InvalidProtocolBufferException.invalidWireType();