Protect _broadcast.socket from simultaneous access.

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 9902c8e84c65bf8d792700f6b2ce5594ea216c4d..d31760c0d975686757df88acc4469baa897956a2 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -97,9 +97,15 @@ EncodeServer::~EncodeServer ()
                delete i;
        }
 
-       if (_broadcast.socket) {
-               _broadcast.socket->close ();
+       {
+               boost::mutex::scoped_lock lm (_broadcast.mutex);
+               if (_broadcast.socket) {
+                       _broadcast.socket->close ();
+                       delete _broadcast.socket;
+                       _broadcast.socket = 0;
+               }
        }
+
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
                /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
@@ -306,6 +312,7 @@ EncodeServer::broadcast_received ()
                }
        }
 
+       boost::mutex::scoped_lock lm (_broadcast.mutex);
        _broadcast.socket->async_receive_from (
                boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
                _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index c9bd5571849d1d0e66aa670daab2795e6930e714..14dc77398a660b730258974cc7b3fee8f9f2d74e 100644 (file)
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -68,6 +68,7 @@ private:
                        , socket (0)
                {}
 
+               boost::mutex mutex;
                boost::thread* thread;
                boost::asio::ip::udp::socket* socket;
                char buffer[64];