transport: Fix a data race when headers are received while the stream…

… is being closed (#1814)
grpc · Jan 19, 2018 · b71aced · b71aced
1 parent 46bef23
commit b71aced
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/transport/http2_client.go b/transport/http2_client.go
@@ -1116,12 +1116,13 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 	}()
 
 	s.mu.Lock()
-	if !endStream {
-		s.recvCompress = state.encoding
-	}
 	if !s.headerDone {
-		if !endStream && len(state.mdata) > 0 {
-			s.header = state.mdata
+		// Headers frame is not actually a trailers-only frame.
+		if !endStream {
+			s.recvCompress = state.encoding
+			if len(state.mdata) > 0 {
+				s.header = state.mdata
+			}
 		}
 		close(s.headerChan)
 		s.headerDone = true