Response stream corruption when a request is cancelled

Author: Duracell1989

src/Docker.DotNet/Endpoints/StreamUtil.cs

@@ -17,15 +17,12 @@ internal static async Task MonitorStreamAsync(Task<Stream> streamTask, DockerCli
             using (var stream = await streamTask)
             {
                 // ReadLineAsync must be cancelled by closing the whole stream.
-                using (cancel.Register(() => stream.Dispose()))
+                using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                 {
-                    using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
+                    string line;
+                    while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
                     {
-                        string line;
-                        while ((line = await reader.ReadLineAsync()) != null)
-                        {
-                            progress.Report(line);
-                        }
+                        progress.Report(line);
                     }
                 }
             }
@@ -54,27 +51,24 @@ internal static async Task MonitorResponseForMessagesAsync<T>(Task<HttpResponseM
                 using (var stream = await response.Content.ReadAsStreamAsync())
                 {
                     // ReadLineAsync must be cancelled by closing the whole stream.
-                    using (cancel.Register(() => stream.Dispose()))
+                    using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                     {
-                        using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
+                        string line;
+                        try
                         {
-                            string line;
-                            try
+                            while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
                             {
-                                while ((line = await reader.ReadLineAsync()) != null)
-                                {
-                                    var prog = client.JsonSerializer.DeserializeObject<T>(line);
-                                    if (prog == null) continue;
+                                var prog = client.JsonSerializer.DeserializeObject<T>(line);
+                                if (prog == null) continue;
 
-                                    progress.Report(prog);
-                                }
-                            }
-                            catch (ObjectDisposedException)
-                            {
-                                // The subsequent call to reader.ReadLineAsync() after cancellation
-                                // will fail because we disposed the stream. Just ignore here.
+                                progress.Report(prog);
                             }
                         }
+                        catch (ObjectDisposedException)
+                        {
+                            // The subsequent call to reader.ReadLineAsync() after cancellation
+                            // will fail because we disposed the stream. Just ignore here.
+                        }
                     }
                 }
             }