Disallow negative RemainingTimeout. Fixes #1424

bgrainger · bgrainger · commit 77479f01dc23 · 2023-12-28T16:21:57.000-08:00
diff --git a/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs
@@ -18,8 +18,9 @@ public StreamByteHandler(Stream stream)
 
 	public ValueTask<int> ReadBytesAsync(Memory<byte> buffer, IOBehavior ioBehavior)
 	{
-		return ioBehavior == IOBehavior.Asynchronous ? new ValueTask<int>(DoReadBytesAsync(buffer)) :
+		return
 			RemainingTimeout <= 0 ? ValueTaskExtensions.FromException<int>(MySqlException.CreateForTimeout()) :
+			ioBehavior == IOBehavior.Asynchronous ? new ValueTask<int>(DoReadBytesAsync(buffer)) :
 			m_stream.CanTimeout ? DoReadBytesSync(buffer) :
 			DoReadBytesSyncOverAsync(buffer);
 

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ public StreamByteHandler(Stream stream)`
`18`	`18`
`19`	`19`	`public ValueTask<int> ReadBytesAsync(Memory<byte> buffer, IOBehavior ioBehavior)`
`20`	`20`	`{`
`21`		`- return ioBehavior == IOBehavior.Asynchronous ? new ValueTask<int>(DoReadBytesAsync(buffer)) :`
	`21`	`+ return`
`22`	`22`	`RemainingTimeout <= 0 ? ValueTaskExtensions.FromException<int>(MySqlException.CreateForTimeout()) :`
	`23`	`+ ioBehavior == IOBehavior.Asynchronous ? new ValueTask<int>(DoReadBytesAsync(buffer)) :`
`23`	`24`	`m_stream.CanTimeout ? DoReadBytesSync(buffer) :`
`24`	`25`	`DoReadBytesSyncOverAsync(buffer);`
`25`	`26`