Fix race condition when aborting a WebConnection and reusing it

LogosBible · Aug 18, 2017 · d326276 · d326276
1 parent 334807a
commit d326276
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
@@ -458,6 +458,9 @@ void ReadDone (IAsyncResult result)
 		{
 			WebConnectionData data = Data;
 			Stream ns = nstream;
+			if (ns != result.AsyncState)
+				return;
+
 			if (ns == null) {
 				Close (true);
 				return;
@@ -575,7 +578,7 @@ internal void InitRead ()
 
 			try {
 				int size = buffer.Length - position;
-				ns.BeginRead (buffer, position, size, ReadDone, null);
+				ns.BeginRead (buffer, position, size, ReadDone, ns);
 			} catch (Exception e) {
 				HandleError (WebExceptionStatus.ReceiveFailure, e, "InitRead");
 			}