Merge 0.69.5 into 1.0.

Author: bgrainger

azure-pipelines.yml

@@ -144,12 +144,16 @@ jobs:
     inputs:
       targetType: 'inline'
       script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;netcoreapp2.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+  - task: DotNetCoreCLI@2
+    displayName: 'Restore packages'
+    inputs:
+      command: 'restore'
   - task: DotNetCoreCLI@2
     displayName: 'Side by Side tests (net472/netcoreapp2.0)'
     inputs:
       command: 'test'
       projects: 'tests/SideBySide/SideBySide.csproj'
-      arguments: '-c Release'
+      arguments: '-c Release --no-restore'
       testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/netcoreapp2.0', 'No SSL') }}
     env:
       DATA__UNSUPPORTEDFEATURES: 'Ed25519,Tls11,UnixDomainSocket'
@@ -177,12 +181,16 @@ jobs:
     inputs:
       targetType: 'inline'
       script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+  - task: DotNetCoreCLI@2
+    displayName: 'Restore packages'
+    inputs:
+      command: 'restore'
   - task: DotNetCoreCLI@2
     displayName: 'Side by Side tests (netcoreapp2.1/netcoreapp3.0)'
     inputs:
       command: 'test'
       projects: 'tests/SideBySide/SideBySide.csproj'
-      arguments: '-c Release -f netcoreapp2.1'
+      arguments: '-c Release -f netcoreapp2.1 --no-restore'
       testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp2.1/netcoreapp3.0', 'No SSL') }}
     env:
       DATA__UNSUPPORTEDFEATURES: 'Ed25519,Tls11,UnixDomainSocket'

docs/content/overview/version-history.md

@@ -37,6 +37,10 @@ Version History
 * Add `net5.0` target framework.
 * Reduce memory allocations when hashing passwords (during login).
 
+### 0.69.5
+
+* Improve robustness of OK packet parsing: [#842](https://github.com/mysql-net/MySqlConnector/issues/842).
+
 ### 0.69.4
 
 * Fix connection pool leak when a failure (e.g., timeout) occurs on a connection: [#836](https://github.com/mysql-net/MySqlConnector/issues/836).

src/MySqlConnector/Protocol/Payloads/OkPayload.cs

@@ -37,33 +37,38 @@ public static OkPayload Create(ReadOnlySpan<byte> span, bool deprecateEof, bool
 			var warningCount = (int) reader.ReadUInt16();
 			string? newSchema = null;
 
-			if (clientSessionTrack && (serverStatus & ServerStatus.SessionStateChanged) == ServerStatus.SessionStateChanged)
+			if (clientSessionTrack)
 			{
-				reader.ReadLengthEncodedByteString(); // human-readable info
-
-				// implies ProtocolCapabilities.SessionTrack
-				var sessionStateChangeDataLength = checked((int) reader.ReadLengthEncodedInteger());
-				var endOffset = reader.Offset + sessionStateChangeDataLength;
-				while (reader.Offset < endOffset)
+				if (reader.BytesRemaining > 0)
 				{
-					var kind = (SessionTrackKind) reader.ReadByte();
-					var dataLength = (int) reader.ReadLengthEncodedInteger();
-					switch (kind)
+					reader.ReadLengthEncodedByteString(); // human-readable info
+
+					if ((serverStatus & ServerStatus.SessionStateChanged) == ServerStatus.SessionStateChanged && reader.BytesRemaining > 0)
 					{
-					case SessionTrackKind.Schema:
-						newSchema = Encoding.UTF8.GetString(reader.ReadLengthEncodedByteString());
-						break;
+						// implies ProtocolCapabilities.SessionTrack
+						var sessionStateChangeDataLength = checked((int) reader.ReadLengthEncodedInteger());
+						var endOffset = reader.Offset + sessionStateChangeDataLength;
+						while (reader.Offset < endOffset)
+						{
+							var kind = (SessionTrackKind) reader.ReadByte();
+							var dataLength = (int) reader.ReadLengthEncodedInteger();
+							switch (kind)
+							{
+							case SessionTrackKind.Schema:
+								newSchema = Encoding.UTF8.GetString(reader.ReadLengthEncodedByteString());
+								break;
 
-					default:
-						reader.Offset += dataLength;
-						break;
+							default:
+								reader.Offset += dataLength;
+								break;
+							}
+						}
 					}
 				}
 			}
 			else
 			{
-				// either "string<EOF> info" or "string<lenenc> info" (followed by no session change info)
-				// ignore human-readable string in both cases
+				// ignore "string<EOF> info" human-readable string
 			}
 
 			if (affectedRowCount == 0 && lastInsertId == 0 && warningCount == 0 && newSchema is null)