Fix memory leak in Stream::Close

refs #10655

diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp
index 796a2c83ddec440f61d6ff6bf8411b65c245cc12..240f9cb7bff54b1cb1ff2ffb0298c5bb7b3127e5 100644 (file)
--- a/lib/base/stream.cpp
+++ b/lib/base/stream.cpp
@@ -76,9 +76,16 @@ bool Stream::WaitForData(int timeout)
        return IsDataAvailable() || IsEof();
 }
 
+static void StreamDummyCallback(void)
+{ }
+
 void Stream::Close(void)
 {
        OnDataAvailable.disconnect_all_slots();
+
+       /* Force signals2 to remove the slots, see https://stackoverflow.com/questions/2049291/force-deletion-of-slot-in-boostsignals2
+        * for details. */
+       OnDataAvailable.connect(boost::bind(&StreamDummyCallback));
 }
 
 StreamReadStatus Stream::ReadLine(String *line, StreamReadContext& context, bool may_wait)