Fix RTMP abort message deleting the chunk stream being parsed - #3452
Open
wwbmmm wants to merge 2 commits into
Open
Fix RTMP abort message deleting the chunk stream being parsed#3452wwbmmm wants to merge 2 commits into
wwbmmm wants to merge 2 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a potential use-after-free in the RTMP chunk parser when handling an Abort control message that targets the same chunk stream currently being parsed, and adds a regression test for that scenario.
Changes:
- Prevent
RtmpChunkStream::OnAbortMessagefrom deleting the currently-parsed chunk stream (this) viaClearChunkStream. - Add a unit test that feeds a self-referencing Abort message to exercise the previous crash/UAF path.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/brpc/policy/rtmp_protocol.cpp |
Avoids deleting the active RtmpChunkStream while Feed() is still executing. |
test/brpc_rtmp_unittest.cpp |
Adds a regression test that constructs a self-referencing Abort message and feeds it through RtmpContext::Feed(). |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
What problem does this PR solve?
Issue Number: null
Problem Summary:
An RTMP Abort control message that references the chunk stream carrying
the message itself made the parser free that chunk stream while it was
still being processed.
RtmpChunkStream::Feed()continues to access thefreed chunk stream right after
OnMessage()returns, which may crash theserver or corrupt memory.
What is changed and the side effects?
Changed:
RtmpChunkStream::OnAbortMessagenow skipsClearChunkStreamwhen theabort targets the chunk stream that is currently being parsed.
verifies the chunk stream survives.
Side effects:
Performance effects: None.
Breaking backward compatibility: None.
Check List: