Fix wrong set usage

versatica · Apr 9, 2024 · 3b23846 · 3b23846
1 parent 6b45209
commit 3b23846
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/worker/include/RTC/WebRtcServer.hpp b/worker/include/RTC/WebRtcServer.hpp
@@ -106,6 +106,8 @@ namespace RTC
 		absl::flat_hash_map<std::string, RTC::WebRtcTransport*> mapLocalIceUsernameFragmentWebRtcTransport;
 		// Map of WebRtcTransports indexed by TransportTuple.hash.
 		absl::flat_hash_map<uint64_t, RTC::WebRtcTransport*> mapTupleWebRtcTransport;
+		// Whether the destructor has been called.
+		bool closing{ false };
 	};
 } // namespace RTC
 

diff --git a/worker/src/RTC/WebRtcServer.cpp b/worker/src/RTC/WebRtcServer.cpp
@@ -232,6 +232,8 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		this->closing = true;
+
 		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
 
 		for (auto& item : this->udpSocketOrTcpServers)
@@ -497,7 +499,14 @@ namespace RTC
 		  this->webRtcTransports.find(webRtcTransport) != this->webRtcTransports.end(),
 		  "WebRtcTransport not handled");
 
-		this->webRtcTransports.erase(webRtcTransport);
+		// NOTE: If WebRtcServer is closing then do not remove the transport from
+		// the set since it would modify the set while the WebRtcServer destructor
+		// is iterating it.
+		// See: https://github.com/versatica/mediasoup/pull/1369#issuecomment-2044672247
+		if (!this->closing)
+		{
+			this->webRtcTransports.erase(webRtcTransport);
+		}
 	}
 
 	inline void WebRtcServer::OnWebRtcTransportLocalIceUsernameFragmentAdded(