Skip to content

Use MemoryExtensions.Split in MimeBasePart.DetectEncoding #80211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2023
+6 −5
Merged

Use MemoryExtensions.Split in MimeBasePart.DetectEncoding #80211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use MemoryExtensions.Split in MimeBasePart.DetectEncoding
  • Loading branch information
@stephentoub
stephentoub committed Jan 4, 2023
commit 419d13b5ed74db42cc984cc607a02e00d0fe22e6
11 changes: 6 additions & 5 deletions src/libraries/System.Net.Mail/src/System/Net/Mime/MimeBasePart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace System.Net.Mime
internal class MimeBasePart
{
internal const string DefaultCharSet = "utf-8";
private static readonly char[] s_decodeEncodingSplitChars = new char[] { '?', '\r', '\n' };

protected ContentType? _contentType;
protected ContentDisposition? _contentDisposition;
Expand Down Expand Up @@ -96,14 +95,16 @@ internal static string DecodeHeaderValue(string? value)
return null;
}

string[] subStrings = value.Split(s_decodeEncodingSplitChars);
if ((subStrings.Length < 5 || subStrings[0] != "=" || subStrings[4] != "="))
ReadOnlySpan<char> valueSpan = value;
Span<Range> subStrings = stackalloc Range[6];
if (valueSpan.SplitAny(subStrings, "?\r\n") < 5 ||
valueSpan[subStrings[0]] is not "=" ||
valueSpan[subStrings[4]] is not "=")
{
return null;
}

string charSet = subStrings[1];
return Encoding.GetEncoding(charSet);
return Encoding.GetEncoding(value[subStrings[1]]);
}

internal static bool IsAscii(string value, bool permitCROrLF)
Expand Down