]> granicus.if.org Git - icinga2/commitdiff
Fix crash in ConfigItem::ActivateItems
authorGunnar Beutner <gunnar@beutner.name>
Mon, 23 Nov 2015 16:25:35 +0000 (17:25 +0100)
committerMichael Friedrich <michael.friedrich@netways.de>
Wed, 25 Nov 2015 12:23:04 +0000 (13:23 +0100)
refs #10643

lib/config/configitem.cpp

index 9e172d817e13c46617fab1e198f026881f41424a..51d1301eb46412d643747b350ae6c4a33dd46337 100644 (file)
@@ -313,8 +313,10 @@ void ConfigItem::Register(void)
  */
 void ConfigItem::Unregister(void)
 {
-       if (m_Object)
+       if (m_Object) {
                m_Object->Unregister();
+               m_Object.reset();
+       }
 
        boost::mutex::scoped_lock lock(m_Mutex);
        m_UnnamedItems.erase(std::remove(m_UnnamedItems.begin(), m_UnnamedItems.end(), this), m_UnnamedItems.end());