transport: Fix a data race when headers are received while the stream is closing #1814
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
dfawley
reviewed
Jan 19, 2018
transport/http2_client.go
Outdated
| @@ -1114,7 +1114,7 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { | |||
| }() | |||
|
|
|||
| s.mu.Lock() | |||
| if !endStream { | |||
| if !endStream && !s.headerDone { | |||
There was a problem hiding this comment.
Nit: Let's keep a single !headerDone block, and maybe also a !endStream block as well:
if !s.headerDone {
if !endStream {
// Headers frame is not actually a trailers-only frame.
s.recvCompress = state.encoding
if len(state.mdata) > 0 {
s.header = state.mdata
......And this led me to find another bug, isHeader should only be set in the if !endStream block... We can fix that separately.
dfawley
approved these changes
Jan 19, 2018
dfawley
changed the title
dfawley
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fix #1803
Disallow assignment to s.recvCompress after header chan is closed.