Throw MySqlProtocolException for short read. Fixes #394

Author: bgrainger

src/MySqlConnector/MySql.Data.MySqlClient/MySqlProtocolException.cs

@@ -5,10 +5,11 @@ namespace MySql.Data.MySqlClient
 {
 	public sealed class MySqlProtocolException : InvalidOperationException
 	{
-		internal static MySqlProtocolException CreateForPacketOutOfOrder(int expectedSequenceNumber, int packetSequenceNumber)
-		{
-			return new MySqlProtocolException("Packet received out-of-order. Expected {0}; got {1}.".FormatInvariant(expectedSequenceNumber, packetSequenceNumber));
-		}
+		internal static MySqlProtocolException CreateForPacketOutOfOrder(int expectedSequenceNumber, int packetSequenceNumber) =>
+			new MySqlProtocolException("Packet received out-of-order. Expected {0}; got {1}.".FormatInvariant(expectedSequenceNumber, packetSequenceNumber));
+
+		internal static MySqlProtocolException CreateForIncompleteRead(int expected, int actual, string beingRead) =>
+			new MySqlProtocolException("Expected to read {0} bytes but only read {1} when reading {2}".FormatInvariant(expected, actual, beingRead));
 
 		private MySqlProtocolException(string message)
 			: base(message)

src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs

@@ -83,7 +83,7 @@ private ValueTask<int> ReadBytesAsync(ArraySegment<byte> buffer, ProtocolErrorBe
 					{
 						return protocolErrorBehavior == ProtocolErrorBehavior.Ignore ?
 							default(ValueTask<int>) :
-							ValueTaskExtensions.FromException<int>(new EndOfStreamException("Wanted to read 7 bytes but only read {0} when reading compressed packet header".FormatInvariant(headerReadBytes.Count)));
+							ValueTaskExtensions.FromException<int>(MySqlProtocolException.CreateForIncompleteRead(7, headerReadBytes.Count, "compressed packet header"));
 					}
 
 					var payloadLength = (int) SerializationUtility.ReadUInt32(headerReadBytes.Array, headerReadBytes.Offset, 3);
@@ -118,7 +118,7 @@ private ValueTask<int> ReadBytesAsync(ArraySegment<byte> buffer, ProtocolErrorBe
 							{
 								return protocolErrorBehavior == ProtocolErrorBehavior.Ignore ?
 									default(ValueTask<int>) :
-									ValueTaskExtensions.FromException<int>(new EndOfStreamException("Wanted to read {0} bytes but only read {1} when reading compressed payload".FormatInvariant(payloadLength, payloadReadBytes.Count)));
+									ValueTaskExtensions.FromException<int>(MySqlProtocolException.CreateForIncompleteRead(payloadLength, payloadReadBytes.Count, "compressed payload"));
 							}
 
 							if (uncompressedLength == 0)

src/MySqlConnector/Protocol/Serialization/ProtocolUtility.cs

@@ -416,7 +416,7 @@ private static ValueTask<Packet> ReadPacketAfterHeader(ArraySegment<byte> header
 			if (headerBytes.Count < 4)
 			{
 				return protocolErrorBehavior == ProtocolErrorBehavior.Throw ?
-					ValueTaskExtensions.FromException<Packet>(new EndOfStreamException("Expected to read 4 header bytes but only received {0}.".FormatInvariant(headerBytes.Count))) :
+					ValueTaskExtensions.FromException<Packet>(MySqlProtocolException.CreateForIncompleteRead(4, headerBytes.Count, "packet header")) :
 					default(ValueTask<Packet>);
 			}
 
@@ -445,7 +445,7 @@ ValueTask<Packet> AddContinuation(ValueTask<ArraySegment<byte>> payloadBytesTask
 
 		private static ValueTask<Packet> CreatePacketFromPayload(ArraySegment<byte> payloadBytes, int payloadLength, ProtocolErrorBehavior protocolErrorBehavior) =>
 			payloadBytes.Count >= payloadLength ? new ValueTask<Packet>(new Packet(payloadBytes)) :
-				protocolErrorBehavior == ProtocolErrorBehavior.Throw ? ValueTaskExtensions.FromException<Packet>(new EndOfStreamException("Expected to read {0} payload bytes but only received {1}.".FormatInvariant(payloadLength, payloadBytes.Count))) :
+				protocolErrorBehavior == ProtocolErrorBehavior.Throw ? ValueTaskExtensions.FromException<Packet>(MySqlProtocolException.CreateForIncompleteRead(payloadLength, payloadBytes.Count, "payload")) :
 				default(ValueTask<Packet>);
 
 		public static ValueTask<ArraySegment<byte>> ReadPayloadAsync(BufferedByteReader bufferedByteReader, IByteHandler byteHandler, Func<int> getNextSequenceNumber, ArraySegmentHolder<byte> cache, ProtocolErrorBehavior protocolErrorBehavior, IOBehavior ioBehavior)