Fix #1466

versatica · Nov 21, 2024 · b70fe72 · b70fe72
1 parent 35ced8f
commit b70fe72
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### NEXT
 
+- `Worker`: Fix crash when using colliding `portRange` values in different transports ([PR #](https://github.com/versatica/mediasoup/pull/)).
+
 ### 3.15.1
 
 - Expose `extras` namespace which exports `EnhancedEventEmitter` and `enhancedOnce()` for now ([PR #1464](https://github.com/versatica/mediasoup/pull/1464)).

diff --git a/worker/src/RTC/PortManager.cpp b/worker/src/RTC/PortManager.cpp
@@ -678,8 +678,8 @@ namespace RTC
 				// We want it in network order.
 				const uint64_t address = bindAddrIn->sin_addr.s_addr;
 
-				hash = static_cast<uint64_t>(minPort) << 48;
-				hash = static_cast<uint64_t>(maxPort) << 32;
+				hash |= static_cast<uint64_t>(minPort) << 48;
+				hash |= static_cast<uint64_t>(maxPort) << 32;
 				hash |= (address >> 2) << 2;
 				hash |= 0x0000; // AF_INET.
 
@@ -693,8 +693,8 @@ namespace RTC
 
 				const auto address = a[0] ^ a[1] ^ a[2] ^ a[3];
 
-				hash = static_cast<uint64_t>(minPort) << 48;
-				hash = static_cast<uint64_t>(maxPort) << 32;
+				hash |= static_cast<uint64_t>(minPort) << 48;
+				hash |= static_cast<uint64_t>(maxPort) << 32;
 				hash |= static_cast<uint64_t>(address) << 16;
 				hash |= (static_cast<uint64_t>(address) >> 2) << 2;
 				hash |= 0x0002; // AF_INET6.