Protect against NullReferenceException in Frame.StopStreams()

2016-11-01 16:24:15 -07:00 · 2016-11-01 16:24:15 -07:00 · 6cbbb73ca7
parent b3aca0413c
commit 6cbbb73ca7
1 changed files with 4 additions and 2 deletions
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs
@ -159,11 +159,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
                        finally
                        {
                            _application.DisposeContext(context, _applicationException);
+
+                            // StopStreams should be called before the end of the "if (!_requestProcessingStopping)" block
+                            // to ensure InitializeStreams has been called.
+                            StopStreams();
                        }
                    }

-                    StopStreams();
-
                    if (!_keepAlive)
                    {
                        // End the connection for non keep alive as data incoming may have been thrown off