Set ResponseLength when Stream.CanSeek

Don't attempt to write bytes when the bytesRead count is 0
yuanzp · Apr 6, 2017 · b357b73 · b357b73
1 parent 440cc7a
commit b357b73
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/CefSharp/ResourceHandler.cs b/CefSharp/ResourceHandler.cs
@@ -153,10 +153,9 @@ public virtual Stream GetResponse(IResponse response, out long responseLength, o
             else
             { 
                 //If no ResponseLength provided then attempt to infer the length
-                var memoryStream = Stream as MemoryStream;
-                if (memoryStream != null)
+                if (Stream != null && Stream.CanSeek)
                 {
-                    responseLength = memoryStream.Length;
+                    responseLength = Stream.Length;
                 }
             }
 
@@ -212,6 +211,12 @@ bool IResourceHandler.ReadResponse(Stream dataOut, out int bytesRead, ICallback
             var buffer = new byte[dataOut.Length];
             bytesRead = Stream.Read(buffer, 0, buffer.Length);
 
+            //If bytesRead is 0 then no point attempting a write to dataOut
+            if(bytesRead == 0)
+            {
+                return false;
+            }
+
             dataOut.Write(buffer, 0, buffer.Length);
 
             return bytesRead > 0;