Wrap GetEncoding in try-catch to avoid platform-specific issues

restsharp · May 13, 2020 · 1636701 · 1636701
1 parent b471dd5
commit 1636701
Showing 1 changed file with 13 additions and 1 deletion.
diff --git 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;
+                }
+            }
         }
 
         /// <summary>