From 1b43f9d12dc3d605056fcb8af442b8f0d07ff901 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 30 Sep 2016 15:01:29 -0400 Subject: [PATCH] cmake-server: Stop the file monitor on client disconnect When the client disconnects we need to remove all events from our loop. Prior to the introduction of the file monitor we only needed to remove the client pipes. Now we need to remove the file monitor events too. Without this the event loop may continue to block on file monitor events. If one does eventually come in then the event handler may try to report it to the disconnected client and crash because our internal structures for writing to the client have been freed. This addresses a failure of the `Server` test on some machines. --- Source/cmServerConnection.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index c62ca3c3e..c9822d396 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -164,6 +164,7 @@ void cmServerConnection::ReadData(const std::string& data) void cmServerConnection::HandleEof() { + this->FileMonitor()->StopMonitoring(); this->TearDown(); }