Fixing bugs.

Stefán J. Sigurðarson · Stefán J. Sigurðarson · commit 31c35f3d2976 · 2020-02-21T15:11:46.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs b/projects/client/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs
@@ -200,6 +200,7 @@ public static object ReadObject(NetworkBinaryReader reader)
             {
                 throw new EndOfStreamException("End of StreamMessage reached");
             }
+
             switch ((StreamWireFormattingTag)typeTag)
             {
                 case StreamWireFormattingTag.Bool:
@@ -439,7 +440,7 @@ public static void WriteUntypedString(NetworkBinaryWriter writer, string value)
             try
             {
                 int bytesUsed = Encoding.UTF8.GetBytes(value, 0, value.Length, bytes, 0);
-                bytes[bytesUsed + 1] = 0;
+                bytes[bytesUsed] = 0;
                 writer.Write(bytes, 0, bytesUsed + 1);
             }
             finally
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/WireFormatting.cs b/projects/client/RabbitMQ.Client/src/client/impl/WireFormatting.cs
@@ -366,7 +366,7 @@ public static void WriteLongstr(NetworkBinaryWriter writer, byte[] val)
 
         public static void WriteLongstr(NetworkBinaryWriter writer, byte[] val, int index, int count)
         {
-            WriteLong(writer, (uint)val.Length);
+            WriteLong(writer, (uint)count);
             writer.Write(val, index, count);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ public static object ReadObject(NetworkBinaryReader reader)`
`200`	`200`	`{`
`201`	`201`	`throw new EndOfStreamException("End of StreamMessage reached");`
`202`	`202`	`}`
	`203`	`+`
`203`	`204`	`switch ((StreamWireFormattingTag)typeTag)`
`204`	`205`	`{`
`205`	`206`	`case StreamWireFormattingTag.Bool:`
`@@ -439,7 +440,7 @@ public static void WriteUntypedString(NetworkBinaryWriter writer, string value)`
`439`	`440`	`try`
`440`	`441`	`{`
`441`	`442`	`int bytesUsed = Encoding.UTF8.GetBytes(value, 0, value.Length, bytes, 0);`
`442`		`- bytes[bytesUsed + 1] = 0;`
	`443`	`+ bytes[bytesUsed] = 0;`
`443`	`444`	`writer.Write(bytes, 0, bytesUsed + 1);`
`444`	`445`	`}`
`445`	`446`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public static void WriteLongstr(NetworkBinaryWriter writer, byte[] val)`
`366`	`366`
`367`	`367`	`public static void WriteLongstr(NetworkBinaryWriter writer, byte[] val, int index, int count)`
`368`	`368`	`{`
`369`		`- WriteLong(writer, (uint)val.Length);`
	`369`	`+ WriteLong(writer, (uint)count);`
`370`	`370`	`writer.Write(val, index, count);`
`371`	`371`	`}`
`372`	`372`