fb

Author: BrennanConroy

src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs

@@ -54,7 +54,7 @@ internal HttpParser(bool showErrorDetails, bool disableHttp1LineFeedTerminators)
     private const byte ByteQuestionMark = (byte)'?';
     private const byte BytePercentage = (byte)'%';
     private const int MinTlsRequestSize = 1; // We need at least 1 byte to check for a proper TLS request line
-    private static ReadOnlySpan<byte> RequestLineDelimiters => new byte[] { ByteLF, 0 };
+    private static ReadOnlySpan<byte> RequestLineDelimiters => [ByteLF, 0];
 
     /// <summary>
     /// This API supports framework infrastructure and is not intended to be used

src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs

@@ -91,18 +91,17 @@ public static string GetHeaderName(this ReadOnlySpan<byte> span)
             return string.Empty;
         }
 
-        var str = string.Create(span.Length, span, (destination, spanPtr) =>
+        var str = string.Create(span.Length, span, static (destination, source) =>
         {
-            if (Ascii.ToUtf16(spanPtr, destination, out _) != OperationStatus.Done)
+            if (Ascii.ToUtf16(source, destination, out var written) != OperationStatus.Done
+                || destination.Contains('\0'))
             {
                 KestrelBadHttpRequestException.Throw(RequestRejectionReason.InvalidCharactersInHeaderName);
             }
+
+            Debug.Assert(written == destination.Length);
         });
 
-        if (str.Contains('\0'))
-        {
-            KestrelBadHttpRequestException.Throw(RequestRejectionReason.InvalidCharactersInHeaderName);
-        }
         return str;
     }
 
@@ -133,19 +132,25 @@ public static string GetRequestHeaderString(this ReadOnlySpan<byte> span, string
 
         if (invalidCharIndex >= 0)
         {
-            if (result[invalidCharIndex] == 0)
-            {
-                throw new InvalidOperationException("Null characters are not allowed in request headers.");
-            }
-            else
-            {
-                throw new InvalidOperationException("Newline characters (CR/LF) are not allowed in request headers.");
-            }
+            ThrowForInvalidCharacter(result[invalidCharIndex]);
         }
 
         return result;
     }
 
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void ThrowForInvalidCharacter(char invalidCharacter)
+    {
+        if (invalidCharacter == 0)
+        {
+            throw new InvalidOperationException("Null characters are not allowed in request headers.");
+        }
+        else
+        {
+            throw new InvalidOperationException("Newline characters (CR/LF) are not allowed in request headers.");
+        }
+    }
+
     private static string GetRequestHeaderStringWithoutDefaultEncodingCore(this ReadOnlySpan<byte> span, string name, Func<string, Encoding?> encodingSelector)
     {
         var encoding = encodingSelector(name);

src/Shared/ServerInfrastructure/StringUtilities.cs

@@ -23,13 +23,15 @@ public static string GetAsciiOrUTF8String(this ReadOnlySpan<byte> span, Encoding
             return string.Empty;
         }
 
-        var resultString = string.Create(span.Length, span, (destination, spanPtr) =>
+        var resultString = string.Create(span.Length, span, static (destination, source) =>
         {
-            if (Ascii.ToUtf16(spanPtr, destination, out _) != OperationStatus.Done)
+            if (Ascii.ToUtf16(source, destination, out var written) != OperationStatus.Done)
             {
                 // Mark resultString for UTF-8 encoding
                 destination[0] = '\0';
             }
+
+            Debug.Assert(destination[0] == '\0' || written == destination.Length);
         });
 
         // If resultString is marked, perform UTF-8 encoding
@@ -51,12 +53,14 @@ public static string GetAsciiOrUTF8String(this ReadOnlySpan<byte> span, Encoding
     // Null checks must be done independently of this method (if required)
     public static string GetAsciiString(this ReadOnlySpan<byte> span)
     {
-        return string.Create(span.Length, span, (destination, spanPtr) =>
+        return string.Create(span.Length, span, static (destination, source) =>
         {
-            if (Ascii.ToUtf16(spanPtr, destination, out _) != OperationStatus.Done)
+            if (Ascii.ToUtf16(source, destination, out var written) != OperationStatus.Done)
             {
                 throw new InvalidOperationException();
             }
+
+            Debug.Assert(written == destination.Length);
         });
     }