From 1636701d0f211b3914c85e1567710af52122d91f Mon Sep 17 00:00:00 2001 From: Alexey Zimarev Date: Wed, 13 May 2020 21:05:52 +0200 Subject: [PATCH] Wrap GetEncoding in try-catch to avoid platform-specific issues --- .../Extensions/StringEncodingExtensions.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/RestSharp/Extensions/StringEncodingExtensions.cs b/src/RestSharp/Extensions/StringEncodingExtensions.cs index e17c03ebb..c93b94d59 100644 --- a/src/RestSharp/Extensions/StringEncodingExtensions.cs +++ b/src/RestSharp/Extensions/StringEncodingExtensions.cs @@ -31,9 +31,21 @@ public static class StringEncodingExtensions [Obsolete("This method will be removed soon. If you use it, please copy the code to your project.")] public static string AsString(this byte[] buffer, string? encoding) { - var enc = encoding.IsEmpty() ? Encoding.UTF8 : Encoding.GetEncoding(encoding) ?? Encoding.UTF8; + var enc = encoding.IsEmpty() ? Encoding.UTF8 : TryParseEncoding(); return AsString(buffer, enc); + + Encoding TryParseEncoding() + { + try + { + return Encoding.GetEncoding(encoding) ?? Encoding.UTF8; + } + catch (ArgumentException) + { + return Encoding.UTF8; + } + } } ///