Merge pull request #205 from bitshares/fix-websocket-close

Fix race condition in websocket server close
bitshares · Jun 24, 2020 · a2b380d · a2b380d
2 parents a876678 + 8b94976
commit a2b380d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
@@ -665,8 +665,9 @@ namespace fc { namespace http {
 
    void websocket_server::close()
    {
+      auto cpy_con = my->_connections;
       websocketpp::lib::error_code ec;
-      for( auto& connection : my->_connections )
+      for( auto& connection : cpy_con )
          my->_server.close( connection.first, websocketpp::close::status::normal, "Goodbye", ec );
    }
 
@@ -709,8 +710,9 @@ namespace fc { namespace http {
 
    void websocket_tls_server::close()
    {
+      auto cpy_con = my->_connections;
       websocketpp::lib::error_code ec;
-      for( auto& connection : my->_connections )
+      for( auto& connection : cpy_con )
          my->_server.close( connection.first, websocketpp::close::status::normal, "Goodbye", ec );
    }