The Free Software Media System - Server Backend & API
Fix live stream consumer leak when PositionTicks is negative
WizardOfYendor13a4dff8cc475
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.csindex 8e14f5bdf4..7e13e17eb6 100644--- a/Emby.Server.Implementations/Session/SessionManager.cs+++ b/Emby.Server.Implementations/Session/SessionManager.cs@@ -1025,15 +1025,22 @@ namespace Emby.Server.Implementations.SessionArgumentNullException.ThrowIfNull(info);+ var session = GetSession(info.SessionId);++ session.StopAutomaticProgress();+if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0){+ // Ensure live stream is cleaned up before throwing, to prevent tuner+ // resource leaks when stalled clients report a negative PositionTicks.+ if (!string.IsNullOrEmpty(info.LiveStreamId))+ {+ await CloseLiveStreamIfNeededAsync(info.LiveStreamId, session.Id).ConfigureAwait(false);+ }+throw new ArgumentOutOfRangeException(nameof(info), "The PlaybackStopInfo's PositionTicks was negative.");}- var session = GetSession(info.SessionId);-- session.StopAutomaticProgress();-var libraryItem = info.ItemId.IsEmpty()? null: GetNowPlayingItem(session, info.ItemId);