From 3401d55f41cac1840b8332b2b0843f58c09ad848 Mon Sep 17 00:00:00 2001
From: Vasily <just.one.man@yandex.ru>
Date: Fri, 8 May 2020 23:11:43 +0300
Subject: [PATCH] Fixed yet another case of hanging on a bad stream

---
 .../LiveTv/TunerHosts/SharedHttpStream.cs             | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index f13b65722..e41ced28b 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Net.Http;
 using System.Threading;
@@ -123,6 +124,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 // Error happened during opening the stream, re-raise the exception to inform the caller
                 throw taskCompletionSource.Task.Exception;
             }
+            if (!taskCompletionSource.Task.Result)
+            {
+                Logger.LogWarning("Zero bytes copied from stream {0} to {1} but no exception raised", GetType().Name, TempFilePath);
+                throw new EndOfStreamException(String.Format(CultureInfo.InvariantCulture,
+                                                             "Zero bytes copied from stream {0}",
+                                                             GetType().Name));
+            }
         }
 
         private Task StartStreaming(HttpResponseInfo response, TaskCompletionSource<bool> openTaskCompletionSource, CancellationToken cancellationToken)
@@ -146,7 +154,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (OperationCanceledException ex)
                 {
-                    Logger.LogWarning(ex, "Copying of {0} to {1} was canceled", GetType().Name, TempFilePath);
+                    Logger.LogInformation("Copying of {0} to {1} was canceled", GetType().Name, TempFilePath);
                     openTaskCompletionSource.TrySetException(ex);
                 }
                 catch (Exception ex)
@@ -154,6 +162,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     Logger.LogError(ex, "Error copying live stream {0} to {1}.", GetType().Name, TempFilePath);
                     openTaskCompletionSource.TrySetException(ex);
                 }
+                openTaskCompletionSource.TrySetResult(false);
 
                 EnableStreamSharing = false;
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);