Fix Any recursion depth for packed regular messages#27514
Open
XananasX7 wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This updates Python ProtoJSON parsing so regular messages packed inside
Anyare routed throughConvertMessage()instead of directly through_ConvertFieldValuePair().ConvertMessage()ownsmax_recursion_depthaccounting. The existing nested-Anyfix already uses it for well-known types, but the regular-message branch still bypassed one message-entry depth step. Thatallowed alternating
Any -> regular message -> Any -> regular messageinputs to consume less recursion budget than equivalent nested messages.The patch also restores the recursion-depth counter with
finally, so failed parses do not leave stale parser state.A regression test covers:
Anyvalues packingproto3.TestAny, which now fail atmax_recursion_depth=5Validation:
python3 -m py_compile python/google/protobuf/json_format.py python/google/protobuf/internal/json_format_test.pygit diff --check origin/main..HEAD