fixes #270 race reading sock.wdeadline

nanomsg · Jan 30, 2017 · 2e75342 · 2e75342
1 parent 400df24
commit 2e75342
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core.go b/core.go
@@ -235,15 +235,17 @@ func (sock *socket) SendMsg(msg *Message) error {
 	}
 	sock.Lock()
 	useBestEffort := sock.bestEffort
-	if sock.wdeadline != 0 {
-		msg.expire = time.Now().Add(sock.wdeadline)
+	wdeadline := sock.wdeadline
+	sock.Unlock()
+
+	if wdeadline != 0 {
+		msg.expire = time.Now().Add(wdeadline)
 	} else {
 		msg.expire = time.Time{}
 	}
-	sock.Unlock()
 
 	if !useBestEffort {
-		timeout := mkTimer(sock.wdeadline)
+		timeout := mkTimer(wdeadline)
 		select {
 		case <-timeout:
 			return ErrSendTimeout