Fix: crash while destructing crmorch (sonic-net#731)

renukamanavalan · Jun 24, 2019 · 6771fea · 6771fea
1 parent ba29927
commit 6771fea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/orchagent/crmorch.cpp b/orchagent/crmorch.cpp
@@ -161,7 +161,8 @@ CrmOrch::CrmOrch(DBConnector *db, string tableName):
         m_resourcesMap.emplace(res.first, CrmResourceEntry(res.second, CRM_THRESHOLD_TYPE_DEFAULT, CRM_THRESHOLD_LOW_DEFAULT, CRM_THRESHOLD_HIGH_DEFAULT));
     }
 
-    auto executor = new ExecutableTimer(m_timer.get(), this);
+    // Note: ExecutableTimer will hold m_timer pointer and release the object later
+    auto executor = new ExecutableTimer(m_timer, this);
     Orch::addExecutor("CRM_COUNTERS_POLL", executor);
     m_timer->start();
 }

diff --git a/orchagent/crmorch.h b/orchagent/crmorch.h
@@ -52,7 +52,7 @@ class CrmOrch : public Orch
 private:
     shared_ptr<DBConnector> m_countersDb = nullptr;
     shared_ptr<Table> m_countersCrmTable = nullptr;
-    shared_ptr<SelectableTimer> m_timer = nullptr;
+    SelectableTimer *m_timer = nullptr;
 
     struct CrmResourceCounter
     {