From c705a19f11146a421c2e2b5802a5cbb28225faa5 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 6 Jan 2017 17:59:51 +0700
Subject: [PATCH] fix race condition in stream

---
 stream.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/stream.go b/stream.go
index affadb09d..ee992656f 100644
--- a/stream.go
+++ b/stream.go
@@ -244,9 +244,8 @@ func (s *stream) CloseRemote(offset protocol.ByteCount) {
 // Cancel is called by session to indicate that an error occurred
 // The stream should will be closed immediately
 func (s *stream) Cancel(err error) {
-	s.cancelled.Set(true)
-
 	s.mutex.Lock()
+	s.cancelled.Set(true)
 	// errors must not be changed!
 	if s.err == nil {
 		s.err = err
@@ -258,8 +257,8 @@ func (s *stream) Cancel(err error) {
 
 // resets the stream locally
 func (s *stream) Reset(err error) {
-	s.resetLocally.Set(true)
 	s.mutex.Lock()
+	s.resetLocally.Set(true)
 	// errors must not be changed!
 	if s.err == nil {
 		s.err = err
@@ -271,8 +270,8 @@ func (s *stream) Reset(err error) {
 
 // resets the stream remotely
 func (s *stream) RegisterRemoteError(err error) {
-	s.resetRemotely.Set(true)
 	s.mutex.Lock()
+	s.resetRemotely.Set(true)
 	// errors must not be changed!
 	if s.err == nil {
 		s.err = err