[Net] Fix Marshalls infinite recursion crash. #51068
Merged
Conversation
This file contains 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
Faless
added
bug
topic:core
topic:network
crash
cherrypick:3.x
akien-mga
reviewed
Jul 30, 2021
Variants like dictionaries and arrays can have cyclic references, which caused `encode_variant` to run an infinite recursion. Instead of keeping a stack and looking for cyclic references which would make serialization slower, this commit adds a `MAX_RECURSION_DEPTH` constant to Variant, and have `encode_variant` keep track of the current recursion depth, bailing when it's too high since this likely means a cyclic reference has been encountered.
Faless
force-pushed
the
net/4.x_marshalls_recurse
branch
from
640af6f to
3246364
Compare
akien-mga
approved these changes
Jul 30, 2021
|
Thanks! |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
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.
Variants like dictionaries and arrays can have cyclic references, which caused
encode_variantto run an infinite recursion.Instead of keeping a stack and looking for cyclic references which would make serialization slower, this commit adds a
MAX_RECURSION_DEPTHconstant to Variant, and haveencode_variantkeep track of the current recursion depth, bailing when it's too high since this likely means a cyclic reference has been encountered.Fixes #51049