Fix StreamCreate failure handling#3357
Open
ljcjclljc wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a crash in StreamCreate(StreamId*, Controller&, ...) by correctly propagating failures from the batched StreamCreate(StreamIds&, ...) overload, preventing out-of-bounds access when a Controller is reused.
Changes:
- Check and return the inner (batched)
StreamCreatereturn code in the single-stream wrapper before indexingrequest_streams[0]. - Add a regression unit test ensuring a second
StreamCreatecall on the sameControllerreturns-1(no crash).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/brpc/stream.cpp |
Fixes the single-stream wrapper to respect the batched overload’s failure return and avoid indexing an empty vector. |
test/brpc_stream_create_unittest.cpp |
Adds a regression test covering repeated StreamCreate on the same Controller. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+28
to
+30
| brpc::StreamId first_stream = brpc::INVALID_STREAM_ID; | ||
| ASSERT_EQ(0, brpc::StreamCreate(&first_stream, cntl, NULL)); | ||
|
|
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 #3356
Problem Summary:
StreamCreate(StreamId*, Controller&, const StreamOptions*)ignored the returnvalue of the batched overload. When the same
Controllerwas reused to create arequest stream twice, the batched overload correctly returned
-1, but thesingle-stream wrapper still unconditionally accessed
request_streams[0].This could cause out-of-bounds access and crash the process.
What is changed and the side effects?
Changed:
StreamCreatein the single-stream wrapperControllerreturns
-1instead of crashingSide effects:
Performance effects:
Breaking backward compatibility:
-1Check List:
https://github.com/apache/brpc/blob/master/CODE_OF_CONDUCT.md.Fixes#3356