From 44397548e4eb3086b71e41c0e0c6382e3e922f14 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Wed, 22 Nov 2023 05:33:30 +0100 Subject: [PATCH] Handle missing metadata (#1399) Create ColumnCountPayload when metadata are missing. Co-authored-by: Bradley Grainger --- .../Protocol/Payloads/ColumnCountPayload.cs | 2 +- .../ColumnCountPayloadTests.cs | 21 +++++++++++++++++++ .../MySqlConnector.Tests.csproj | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/MySqlConnector.Tests/ColumnCountPayloadTests.cs diff --git a/src/MySqlConnector/Protocol/Payloads/ColumnCountPayload.cs b/src/MySqlConnector/Protocol/Payloads/ColumnCountPayload.cs index 551093d59..8e407ac89 100644 --- a/src/MySqlConnector/Protocol/Payloads/ColumnCountPayload.cs +++ b/src/MySqlConnector/Protocol/Payloads/ColumnCountPayload.cs @@ -22,7 +22,7 @@ public static ColumnCountPayload Create(ReadOnlySpan span, bool supportsOp { var reader = new ByteArrayReader(span); var columnCount = (int) reader.ReadLengthEncodedInteger(); - var metadataFollows = !supportsOptionalMetadata || reader.ReadByte() == 1; + var metadataFollows = !supportsOptionalMetadata || reader.BytesRemaining == 0 || reader.ReadByte() == 1; return new ColumnCountPayload(columnCount, metadataFollows); } } diff --git a/tests/MySqlConnector.Tests/ColumnCountPayloadTests.cs b/tests/MySqlConnector.Tests/ColumnCountPayloadTests.cs new file mode 100644 index 000000000..010d6793c --- /dev/null +++ b/tests/MySqlConnector.Tests/ColumnCountPayloadTests.cs @@ -0,0 +1,21 @@ +using MySqlConnector.Protocol.Payloads; + +namespace MySqlConnector.Tests; + +public class ColumnCountPayloadTests +{ + [Theory] + [InlineData(new byte[] { 1 }, false, 1, true)] + [InlineData(new byte[] { 1, 1 }, true, 1, true)] + [InlineData(new byte[] { 1, 0 }, true, 1, false)] + [InlineData(new byte[] { 2 }, false, 2, true)] + [InlineData(new byte[] { 2, 1 }, true, 2, true)] + [InlineData(new byte[] { 2, 0 }, true, 2, false)] + [InlineData(new byte[] { 2 }, true, 2, true)] // this seems like invalid data, but a server may return this + public void ParseResultSetHeader(byte[] span, bool supportsOptionalMetadata, int expectedColumnCount, bool expectedMetadataFollows) + { + var columnCountPayload = ColumnCountPayload.Create(span.AsSpan(), supportsOptionalMetadata); + Assert.Equal(expectedColumnCount, columnCountPayload.ColumnCount); + Assert.Equal(expectedMetadataFollows, columnCountPayload.MetadataFollows); + } +} diff --git a/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj b/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj index 473c72caa..8eddd9566 100644 --- a/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj +++ b/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj @@ -47,7 +47,7 @@ - +