Progress

Author: Youssef1313

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -2648,4 +2648,19 @@ Proceed?</value>
   <data name="CmdMinimumExpectedTestsDescription" xml:space="preserve">
     <value>Specifies the minimum number of tests that are expected to run.</value>
   </data>
-</root>
+  <data name="DotnetTestPipeOverlapping" xml:space="preserve">
+    <value>'dotnet' unexpectedly received overlapping messages from the 'dotnet test' named pipe.</value>
+  </data>
+  <data name="DotnetTestPipeIncompleteSize" xml:space="preserve">
+    <value>'dotnet' unexpectedly received less than 4 bytes from the 'dotnet test' named pipe.</value>
+  </data>
+  <data name="InternalLoopAsyncDidNotExitSuccessfullyErrorMessage" xml:space="preserve">
+    <value>Method '{0}' did not exit successfully</value>
+  </data>
+  <data name="DotnetTestPipeFailureHasHandshake" xml:space="preserve">
+    <value>Error disposing 'NamedPipeServer' corresponding to handshake:</value>
+  </data>
+  <data name="DotnetTestPipeFailureWithoutHandshake" xml:space="preserve">
+    <value>Error disposing 'NamedPipeServer', and no handshake was found.</value>
+  </data>
+</root>

src/Cli/dotnet/Commands/Test/IPC/NamedPipeServer.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Buffers;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO.Pipes;
 
@@ -86,6 +87,11 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
             if (currentMessageSize == 0)
             {
                 // We need to read the message size, first 4 bytes
+                if (currentReadBytes < sizeof(int))
+                {
+                    throw new UnreachableException("");
+                }
+
                 currentMessageSize = BitConverter.ToInt32(_readBuffer, 0);
                 missingBytesToReadOfCurrentChunk = currentReadBytes - sizeof(int);
                 missingBytesToReadOfWholeMessage = currentMessageSize;
@@ -99,6 +105,11 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
                 missingBytesToReadOfWholeMessage -= missingBytesToReadOfCurrentChunk;
             }
 
+            if (missingBytesToReadOfWholeMessage < 0)
+            {
+                throw new UnreachableException(CliCommandStrings.DotnetTestPipeOverlapping);
+            }
+
             // If we have read all the message, we can deserialize it
             if (missingBytesToReadOfWholeMessage == 0)
             {
@@ -207,7 +218,7 @@ public void Dispose()
                 // To close gracefully we need to ensure that the client closed the stream line 103.
                 if (!_loopTask.Wait(TimeSpan.FromSeconds(90)))
                 {
-                    throw new InvalidOperationException("InternalLoopAsyncDidNotExitSuccessfullyErrorMessage");
+                    throw new InvalidOperationException(CliCommandStrings.InternalLoopAsyncDidNotExitSuccessfullyErrorMessage);
                 }
             }
         }

src/Cli/dotnet/Commands/Test/TestApplication.cs

@@ -393,7 +393,7 @@ public void Dispose()
                 StringBuilder messageBuilder;
                 if (_handshakes.TryGetValue(namedPipeServer, out var handshake))
                 {
-                    messageBuilder = new StringBuilder("Error disposing NamedPipeServer corresponding to handshake:");
+                    messageBuilder = new StringBuilder(CliCommandStrings.DotnetTestPipeFailureWithoutHandshake);
                     messageBuilder.AppendLine();
                     foreach (var kvp in handshake.Properties)
                     {
@@ -402,7 +402,7 @@ public void Dispose()
                 }
                 else
                 {
-                    messageBuilder = new StringBuilder("Error disposing NamedPipeServer, and no handshake was found.");
+                    messageBuilder = new StringBuilder(CliCommandStrings.DotnetTestPipeFailureWithoutHandshake);
                     messageBuilder.AppendLine();
                 }