From f83f3bca081a664f37bc1e057d51c0ea4a7a6c70 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 18 Jan 2019 20:25:56 -0800
Subject: [PATCH] Lock when removing disconnect handler (#6862)

---
 .../IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp     | 1 +
 src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
index ad2ff17b47..5b8008fe5c 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
@@ -53,5 +53,6 @@ void DisconnectHandler::SetHandler(std::unique_ptr<IREQUEST_HANDLER, IREQUEST_HA
 
 void DisconnectHandler::RemoveHandler() noexcept
 {
+    SRWExclusiveLock lock(m_handlerLock);
     m_pHandler = nullptr;
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h
index 8bac2885b0..6274efc07e 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h
@@ -24,6 +24,8 @@ public:
     VOID
     ReferenceRequestHandler() noexcept override
     {
+        DBG_ASSERT(m_cRefs != 0);
+
         InterlockedIncrement(&m_cRefs);
     }