From f4526e5b733ac8d856ae42a3483ca926fa58d0b9 Mon Sep 17 00:00:00 2001
From: Christopher Haster <chaster@utexas.edu>
Date: Tue, 19 Apr 2016 20:43:18 -0500
Subject: [PATCH] Fix race condition in socket close

---
 net/NetworkSocketAPI/Socket.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/NetworkSocketAPI/Socket.cpp b/net/NetworkSocketAPI/Socket.cpp
index aa8a47023c..f2eeb14f1e 100644
--- a/net/NetworkSocketAPI/Socket.cpp
+++ b/net/NetworkSocketAPI/Socket.cpp
@@ -53,7 +53,9 @@ int Socket::close()
         return 0;
     }
 
-    void *socket = _socket;
+    _iface->socket_attach(_socket, 0, 0);
+
+    void *volatile socket = _socket;
     _socket = 0;
     return _iface->socket_close(socket);
 }