huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make GetKnownHttpScheme "safe" (#21204)

This commit is contained in:
Ben Adams 2020-04-28 20:58:38 +01:00 committed by GitHub
parent e73d0fb575
commit 8b2f8088e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs
View File

@ -430,20 +430,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
/// <param name="knownScheme">A reference to the known scheme, if the input matches any</param> /// <param name="knownScheme">A reference to the known scheme, if the input matches any</param>
/// <returns>True when memory starts with known http or https schema</returns> /// <returns>True when memory starts with known http or https schema</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static unsafe bool GetKnownHttpScheme(this Span<byte> span, out HttpScheme knownScheme) public static bool GetKnownHttpScheme(this Span<byte> span, out HttpScheme knownScheme)
{ {
fixed (byte* data = span) if (BinaryPrimitives.TryReadUInt64LittleEndian(span, out var scheme))
{ {
return GetKnownHttpScheme(data, span.Length, out knownScheme);
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static unsafe bool GetKnownHttpScheme(byte* location, int length, out HttpScheme knownScheme)
{
if (length >= sizeof(ulong))
{
var scheme = *(ulong*)location;
if ((scheme & _mask7Chars) == _httpSchemeLong) if ((scheme & _mask7Chars) == _httpSchemeLong)
{ {
knownScheme = HttpScheme.Http; knownScheme = HttpScheme.Http;