Cherry pick #104751 to 25.8: Fix use-after-free in AvroConfluentRowInputFormat#104841
Merged
robot-clickhouse-ci-1 merged 6 commits intoMay 13, 2026
Merged
Conversation
`AvroConfluentRowInputFormat::getOrCreateDeserializer` built an `AvroDeserializer` on the stack and copied it into `deserializer_cache`. The deserializer holds `symbolic_skip_fn_map`, and skip lambdas in its action tree capture references into that map. Copying deep-copies the map to a new address while the lambdas still reference the original; once the stack local is destroyed those references dangle, and the next row deserialization invokes a `std::function` over freed memory. Move into the cache instead of copying. `std::map` move-construction transfers existing nodes without relocating them, so the captured references remain valid.
Prevent reintroduction of the use-after-free fixed in the previous commit. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The previous schema's symbolic reference sat at the top level of a skipped field, so createAction resolved it before createSkipFn was called, never building the reference-capturing lambda. A recursive Node schema with `next: ["null", "Node"]` puts the symbolic node inside a union branch, which is one of the spots createSkipFn recurses into on its own. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…lizer-copy Fix use-after-free in `AvroConfluentRowInputFormat`
robot-clickhouse-ci-1
added
pr-cherrypick
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
3 participants
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.
Original pull-request #104751
Do not merge this PR manually
This pull-request is a first step of an automated backporting.
It contains changes similar to calling
git cherry-picklocally.If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
The check results does not matter at this step - you can safely ignore them.
Troubleshooting
If the conflicts were resolved in a wrong way
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:
pr-cherrypicklabel from the PRYou also need to check the Original pull-request for
pr-backports-createdlabel, and delete if it's presented thereThe PR source
The PR is created in the CI job