Skip to content

Fix NRE in EncodingProvider #55238

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
stephentoub merged 2 commits into from
Jul 8, 2021
+21 −1
Merged

Fix NRE in EncodingProvider #55238

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f012e49
Issue 55233: fix NRE in EncodingProvider
SergeiPavlov Jul 6, 2021
0e0ade5
Add test
stephentoub Jul 7, 2021
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
Prev Previous commit
Add test
  • Loading branch information
@stephentoub
stephentoub committed Jul 7, 2021
commit 0e0ade5e7cb185de99139b6f2baa3cc2badb103e
20 changes: 20 additions & 0 deletions src/libraries/System.Runtime/tests/System/Text/EncodingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.RemoteExecutor;
using Moq;
using Xunit;

Expand Down Expand Up @@ -106,6 +107,25 @@ public void GetEncodings_FromProvider_DoesNotContainDisallowedEncodings(string e
});
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void RegisterProvider_EncodingsAreUsable()
{
RemoteExecutor.Invoke(() =>
{
for (int i = 0; i < 10; i++)
{
Encoding.RegisterProvider(new NullEncodingProvider());
Assert.Same(Encoding.UTF8, Encoding.GetEncoding(65001));
}
}).Dispose();
}

private sealed class NullEncodingProvider : EncodingProvider
{
public override Encoding GetEncoding(int codepage) => null;
public override Encoding GetEncoding(string name) => null;
}

private sealed class ThreadStaticEncodingProvider : EncodingProvider
{
private static readonly object _globalRegistrationLockObj = new object();
Expand Down