Safely release SIP user agent semaphore (#984)

sipsorcery-org · Oct 2, 2023 · 2566204 · 2566204
1 parent ec8fed0
commit 2566204
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/app/SIPUserAgents/SIPUserAgent.cs b/src/app/SIPUserAgents/SIPUserAgent.cs
@@ -664,7 +664,7 @@ public async Task<bool> Answer(SIPServerUserAgent uas, IMediaSession mediaSessio
             }
             finally
             {
-                m_semaphoreSlim.Release();
+                TryReleaseSemaphore();
             }
         }
 
@@ -1753,7 +1753,7 @@ private void CallEnded(string callId)
             }
             finally
             {
-                m_semaphoreSlim.Release();
+                TryReleaseSemaphore();
             }
         }
 
@@ -1940,8 +1940,20 @@ public void Dispose()
 
             // Wait for completion of CallEnded and Answer methods
             m_semaphoreSlim.Wait();
-            m_semaphoreSlim.Release();
+            TryReleaseSemaphore();
             m_semaphoreSlim.Dispose();
         }
+
+		private void TryReleaseSemaphore()
+		{
+			try
+			{
+				m_semaphoreSlim.Release();
+			}
+			catch (ObjectDisposedException)
+			{
+				//Swallow it
+			}
+		}
     }
 }