Cleanup.

tmds · Oct 19, 2024 · d63f28d · d63f28d
1 parent 72217a9
commit d63f28d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Tmds.Ssh/SftpChannel.cs b/src/Tmds.Ssh/SftpChannel.cs
@@ -64,7 +64,6 @@ internal int GetCopyBetweenSftpFilesBufferSize(byte[] destinationHandle)
 
     internal SftpExtension EnabledExtensions => _supportedExtensions;
 
-
     private bool SupportsCopyData => (_supportedExtensions & SftpExtension.CopyData) != 0;
 
     public void Dispose()
@@ -209,7 +208,7 @@ public async ValueTask CopyFileAsync(string sourcePath, string destinationPath,
         sourceAttributesTask = sourceFile.GetAttributesAsync(cancellationToken);
 #pragma warning restore CS8619
 
-        // When we are overwriting. The file may exists and be larger than the source file.
+        // When we are overwriting, the file may exists and be larger than the source file.
         // We could open with Truncate but then the user would lose their data if they (by accident) uses a source and destination that are the same file.
         // To avoid that, we'll truncate after copying the data instead.
         SftpOpenFlags openFlags = overwrite ? SftpOpenFlags.OpenOrCreate : SftpOpenFlags.CreateNew;
@@ -246,7 +245,7 @@ public async ValueTask CopyFileAsync(string sourcePath, string destinationPath,
         long initialLength = await initialLengthTask.ConfigureAwait(false);
         if (initialLength > copyLength)
         {
-            await destinationFile.SetLengthAsync(copyLength);
+            await destinationFile.SetLengthAsync(copyLength).ConfigureAwait(false);
         }
 
         async ValueTask CopyAsync(long length, CancellationToken cancellationToken)
@@ -286,12 +285,15 @@ async ValueTask CopyBuffer(ValueTask previousCopy, long offset, int length)
                                 {
                                     return;
                                 }
+
                                 buffer = ArrayPool<byte>.Shared.Rent(length);
                                 bytesRead = await sourceFile.ReadAtAsync(buffer, sourceFile.Position + offset, cancellationToken).ConfigureAwait(false);
                                 if (bytesRead == 0)
                                 {
                                     break;
                                 }
+
+                                // Our download buffer becomes an upload buffer.
                                 await s_uploadBufferSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
                             }
                             catch
@@ -316,6 +318,11 @@ async ValueTask CopyBuffer(ValueTask previousCopy, long offset, int length)
                             }
                             finally
                             {
+                                if (buffer != null)
+                                {
+                                    ArrayPool<byte>.Shared.Return(buffer);
+                                    buffer = null;
+                                }
                                 s_uploadBufferSemaphore.Release();
                             }
                         }
@@ -810,6 +817,7 @@ async ValueTask CopyBuffer(ValueTask previousCopy, long offset, int length)
                     {
                         return;
                     }
+
                     buffer = ArrayPool<byte>.Shared.Rent(length);
                     do
                     {
@@ -1100,6 +1108,7 @@ async ValueTask CopyBuffer(ValueTask previousCopy, long offset, int length)
                     {
                         return;
                     }
+
                     buffer = ArrayPool<byte>.Shared.Rent(length);
                     do
                     {

diff --git a/test/Tmds.Ssh.Tests/sshd_container/Dockerfile b/test/Tmds.Ssh.Tests/sshd_container/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/centos/centos:stream9
+FROM quay.io/centos/centos:stream10-development
 
 EXPOSE 88/tcp
 EXPOSE 88/udp