Merge pull request #733 from rabbitmq/rabbitmq-dotnet-client-731

Merge pull request #729 from stebet/crossPlatformSerialization

Author: michaelklishin

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -73,6 +73,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' == 'SignedRelease' ">

projects/client/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs

@@ -38,6 +38,7 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System.Buffers;
 using System.Text;
 using RabbitMQ.Util;
 
@@ -66,7 +67,7 @@ public static byte[] ReadBytes(NetworkBinaryReader reader, int count)
 
         public static char ReadChar(NetworkBinaryReader reader)
         {
-            return (char) reader.ReadUInt16();
+            return (char)reader.ReadUInt16();
         }
 
         public static double ReadDouble(NetworkBinaryReader reader)
@@ -118,7 +119,7 @@ public static void WriteBytes(NetworkBinaryWriter writer, byte[] source)
 
         public static void WriteChar(NetworkBinaryWriter writer, char value)
         {
-            writer.Write((ushort) value);
+            writer.Write((ushort)value);
         }
 
         public static void WriteDouble(NetworkBinaryWriter writer, double value)
@@ -148,9 +149,18 @@ public static void WriteSingle(NetworkBinaryWriter writer, float value)
 
         public static void WriteString(NetworkBinaryWriter writer, string value)
         {
-            byte[] bytes = Encoding.UTF8.GetBytes(value);
-            writer.Write((ushort) bytes.Length);
-            writer.Write(bytes);
+            int maxLength = Encoding.UTF8.GetMaxByteCount(value.Length);
+            byte[] bytes = ArrayPool<byte>.Shared.Rent(maxLength);
+            try
+            {
+                int bytesUsed = Encoding.UTF8.GetBytes(value, 0, value.Length, bytes, 0);
+                writer.Write((ushort)bytesUsed);
+                writer.Write(bytes, 0, bytesUsed);
+            }
+            finally
+            {
+                ArrayPool<byte>.Shared.Return(bytes);
+            }
         }
     }
 }