Skip to content

Commit 1636701

Browse files
committed
Wrap GetEncoding in try-catch to avoid platform-specific issues
1 parent b471dd5 commit 1636701

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/RestSharp/Extensions/StringEncodingExtensions.cs

+13-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,21 @@ public static class StringEncodingExtensions
3131
[Obsolete("This method will be removed soon. If you use it, please copy the code to your project.")]
3232
public static string AsString(this byte[] buffer, string? encoding)
3333
{
34-
var enc = encoding.IsEmpty() ? Encoding.UTF8 : Encoding.GetEncoding(encoding) ?? Encoding.UTF8;
34+
var enc = encoding.IsEmpty() ? Encoding.UTF8 : TryParseEncoding();
3535

3636
return AsString(buffer, enc);
37+
38+
Encoding TryParseEncoding()
39+
{
40+
try
41+
{
42+
return Encoding.GetEncoding(encoding) ?? Encoding.UTF8;
43+
}
44+
catch (ArgumentException)
45+
{
46+
return Encoding.UTF8;
47+
}
48+
}
3749
}
3850

3951
/// <summary>

0 commit comments

Comments
 (0)