PR review feedback

dotnet · Mar 23, 2018 · 474d53f · 474d53f
1 parent 40bec88
commit 474d53f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/samples/AzCopyCore/AzCopyCore/Helpers/PipelinesExtensions.cs b/samples/AzCopyCore/AzCopyCore/Helpers/PipelinesExtensions.cs
@@ -50,7 +50,7 @@ public static async Task WriteAsync(this PipeWriter writer, Stream stream, long
             while (bytesToWrite > 0)
             {
                 Memory<byte> buffer = writer.GetMemory();
-                if(buffer.Length > bytesToWrite)
+                if (buffer.Length > bytesToWrite)
                 {
                     buffer = buffer.Slice(0, (int)bytesToWrite);
                 }

diff --git a/samples/AzCopyCore/AzCopyCore/Program.cs b/samples/AzCopyCore/AzCopyCore/Program.cs
@@ -200,7 +200,7 @@ static async ValueTask<bool> CopyLocalFileToStorageFile(StorageClient client, st
                 long bytesLeft = bytes.Length;
                 long index = 0;
                 int length = 1024 * 1024 * 4; 
-                while (true)
+                while (bytesLeft > 0)
                 {
                     if (bytesLeft < length) length = (int)bytesLeft;
                     var putRequest = new PutRangeRequest(storagePath, bytes, index, length);
@@ -212,7 +212,7 @@ static async ValueTask<bool> CopyLocalFileToStorageFile(StorageClient client, st
                     }
                     index += length;
                     bytesLeft -= length;
-                    if (bytesLeft == 0) break;
+                    Debug.Assert(bytesLeft >= 0);
                 }
             }
         }

diff --git a/samples/AzCopyCore/AzCopyCore/StorageRequests.cs b/samples/AzCopyCore/AzCopyCore/StorageRequests.cs
@@ -112,7 +112,7 @@ public struct PutRangeRequest : IStorageRequest
 
         public PutRangeRequest(string filePath, Stream fileContent, long offset, int length)
         {
-            if (offset < 0) throw new ArgumentOutOfRangeException(nameof(offset));
+            if (offset < 0 || offset > fileContent.Length - length) throw new ArgumentOutOfRangeException(nameof(offset));
             if (length < 1) throw new ArgumentOutOfRangeException(nameof(length)); 
 
             _filePath = filePath;
@@ -139,7 +139,7 @@ class Writer : StorageRequestWriter<PutRangeRequest>
 
             protected override async Task WriteBody(PipeWriter writer, PutRangeRequest arguments)
             {
-                var stream = arguments._fileContent;
+                Stream stream = arguments._fileContent;
                 stream.Seek(arguments._offset, SeekOrigin.Begin);
                 await writer.WriteAsync(stream, arguments._length);
             }
@@ -150,8 +150,8 @@ protected override void WriteXmsHeaders(ref BufferWriter writer, ref PutRangeReq
                 writer.WriteHeader("x-ms-date", Time, 'R');
                 // TODO (pri 3): this allocation should be eliminated
 
-                var start = arguments._offset;
-                var end = start + arguments._length - 1;
+                long start = arguments._offset;
+                long end = start + arguments._length - 1;
                 writer.WriteHeader("x-ms-range", $"bytes={start}-{end}");
                 writer.WriteHeader("x-ms-version", "2017-04-17");
                 writer.WriteHeader("x-ms-write", "update");