Skip to content

Remove unsafe code from System.Web.HttpUtility #43422

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
GrabYourPitchforks merged 1 commit into from
Oct 15, 2020
Merged

Remove unsafe code from System.Web.HttpUtility #43422

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
87 changes: 39 additions & 48 deletions src/libraries/System.Web.HttpUtility/src/System/Web/Util/HttpEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal static void HtmlAttributeEncode(string? value, TextWriter output)
HtmlAttributeEncodeInternal(value, output);
}

private static unsafe void HtmlAttributeEncodeInternal(string s, TextWriter output)
private static void HtmlAttributeEncodeInternal(string s, TextWriter output)
{
int index = IndexOfHtmlAttributeEncodingChars(s, 0);
if (index == -1)
Expand All @@ -73,44 +73,37 @@ private static unsafe void HtmlAttributeEncodeInternal(string s, TextWriter outp
}
else
{
int cch = s.Length - index;
fixed (char* str = s)
{
char* pch = str;
while (index-- > 0)
{
output.Write(*pch++);
}
output.Write(s.AsSpan(0, index));

while (cch-- > 0)
ReadOnlySpan<char> remaining = s.AsSpan(index);
for (int i = 0; i < remaining.Length; i++)
{
char ch = remaining[i];
Copy link
Member

@stephentoub stephentoub Oct 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, the above could also be simply:

foreach (char ch in s.AsSpan(index))

The compiler will rewrite that to be basically identical to what's above.

if (ch <= '<')
{
char ch = *pch++;
if (ch <= '<')
{
switch (ch)
{
case '<':
output.Write("&lt;");
break;
case '"':
output.Write("&quot;");
break;
case '\'':
output.Write("&#39;");
break;
case '&':
output.Write("&amp;");
break;
default:
output.Write(ch);
break;
}
}
else
switch (ch)
{
output.Write(ch);
case '<':
output.Write("&lt;");
break;
case '"':
output.Write("&quot;");
break;
case '\'':
output.Write("&#39;");
break;
case '&':
output.Write("&amp;");
break;
default:
output.Write(ch);
break;
}
}
else
{
output.Write(ch);
}
}
}
}
Expand Down Expand Up @@ -141,25 +134,23 @@ internal static void HtmlEncode(string? value, TextWriter output)
output.Write(WebUtility.HtmlEncode(value));
}

private static unsafe int IndexOfHtmlAttributeEncodingChars(string s, int startPos)
private static int IndexOfHtmlAttributeEncodingChars(string s, int startPos)
{
Debug.Assert(0 <= startPos && startPos <= s.Length, "0 <= startPos && startPos <= s.Length");
int cch = s.Length - startPos;
fixed (char* str = s)

ReadOnlySpan<char> span = s.AsSpan(startPos);
for (int i = 0; i < span.Length; i++)
{
for (char* pch = &str[startPos]; cch > 0; pch++, cch--)
char ch = span[i];
if (ch <= '<')
{
char ch = *pch;
if (ch <= '<')
switch (ch)
{
switch (ch)
{
case '<':
case '"':
case '\'':
case '&':
return s.Length - cch;
}
case '<':
case '"':
case '\'':
case '&':
return startPos + i;
}
}
}
Expand Down