Fix race condition in close_msg that causes seg fault

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index fc7f22ae7dc91c3d8269e275b7a63f5556d74093..2a67c78ea6d35f48ca49b0d5bf4fabde5df9b49c 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -517,6 +517,11 @@ void close_msg(JCR *jcr)
       return;
    }
    msgs->wait_not_in_use();          /* leaves fides_mutex set */
+   /* Note get_closing() does not lock because we are already locked */
+   if (msgs->get_closing()) {
+      msgs->unlock();
+      return;
+   }
    msgs->set_closing();
    msgs->unlock();
 

diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index f075df7154bfe83d64f2b69dfa7c54020632c820..0a833535673868dc94bc73aea636d58a8d17da39 100644 (file)
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -145,6 +145,7 @@ public:
    void clear_in_use() { lock(); m_in_use=false; unlock(); }
    void set_in_use() { wait_not_in_use(); m_in_use=true; unlock(); }
    void set_closing() { m_closing=true; }
+   bool get_closing() { return m_closing; }
    void clear_closing() { lock(); m_closing=false; unlock(); }
    bool is_closing() { lock(); bool rtn=m_closing; unlock(); return rtn; }