Handle rejected RTMP streams on response failure - #3508
Open
wasphin wants to merge 1 commit into
Open
Conversation
Avoid accessing the stream failure callback when NewStream rejects a createStream request and writing the rejection response also fails.
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a crash in the RTMP server-side createStream handling when the service rejects stream creation (returns null) and the subsequent attempt to write the rejection response fails; the error path previously dereferenced the null stream while notifying failure.
Changes:
- Guard the stream failure-callback notification so it only runs when a stream was actually created.
- On response-write failure with no created stream, return failure without touching stream state (allowing the connection to be closed safely).
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
2714
to
2723
| PLOG(WARNING) << socket->remote_side() << '[' << mh.stream_id | ||
| << "] Fail to respond createStream"; | ||
| // End the stream at server-side. | ||
| const bthread_id_t id = stream->_onfail_id; | ||
| if (id != INVALID_BTHREAD_ID) { | ||
| bthread_id_error(id, 0); | ||
| if (stream != nullptr) { | ||
| const bthread_id_t id = stream->_onfail_id; | ||
| if (id != INVALID_BTHREAD_ID) { | ||
| bthread_id_error(id, 0); | ||
| } | ||
| } | ||
| return false; |
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: resolve
Problem Summary:
An RTMP service may reject a
createStreamrequest by returning a null stream.If writing the rejection response also fails, the error path accesses the null
stream while attempting to notify its failure callback.
What is changed and the side effects?
Changed:
Only notify the stream failure callback when a stream was created. A rejected
request with a failed response now closes the connection without accessing the
missing stream.
Side effects:
Performance effects: None.
Breaking backward compatibility: No.
Check List: