Preserve frame end marker for the exception prior to returning the buffer to the array pool

lukebakken · lukebakken · commit 3692cb3a5d02 · 2023-02-08T09:49:52.000-08:00
diff --git a/projects/RabbitMQ.Client/client/impl/Frame.cs b/projects/RabbitMQ.Client/client/impl/Frame.cs
@@ -344,8 +344,9 @@ internal static bool TryReadFrame(ref ReadOnlySequence<byte> buffer, uint maxMes
 
                 if (payloadBytes[payloadSize] != Constants.FrameEnd)
                 {
-                    ArrayPool<byte>.Shared.Return(array: payloadBytes, clearArray: true);
-                    throw new MalformedFrameException($"Bad frame end marker: {payloadBytes[payloadSize]}");
+                    var frameEndMarker = payloadBytes[payloadSize];
+                    ArrayPool<byte>.Shared.Return(payloadBytes);
+                    throw new MalformedFrameException($"Bad frame end marker: {frameEndMarker}");
                 }
 
                 RabbitMqClientEventSource.Log.DataReceived(payloadSize + Framing.BaseFrameSize);

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,9 @@ internal static bool TryReadFrame(ref ReadOnlySequence<byte> buffer, uint maxMes`
`344`	`344`
`345`	`345`	`if (payloadBytes[payloadSize] != Constants.FrameEnd)`
`346`	`346`	`{`
`347`		`- ArrayPool<byte>.Shared.Return(array: payloadBytes, clearArray: true);`
`348`		`- throw new MalformedFrameException($"Bad frame end marker: {payloadBytes[payloadSize]}");`
	`347`	`+ var frameEndMarker = payloadBytes[payloadSize];`
	`348`	`+ ArrayPool<byte>.Shared.Return(payloadBytes);`
	`349`	`+ throw new MalformedFrameException($"Bad frame end marker: {frameEndMarker}");`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`RabbitMqClientEventSource.Log.DataReceived(payloadSize + Framing.BaseFrameSize);`