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

madhanmellanox · Dec 21, 2018 · 5803a8c · 5803a8c
1 parent 998b4ab
commit 5803a8c
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
@@ -165,7 +165,8 @@ CrmOrch::CrmOrch(DBConnector *db, string tableName):
     // The CRM stats needs to be populated again
     m_countersCrmTable->del(CRM_COUNTERS_TABLE_KEY);
 
-    auto executor = new ExecutableTimer(m_timer.get(), this, "CRM_COUNTERS_POLL");
+    // Note: ExecutableTimer will hold m_timer pointer and release the object later
+    auto executor = new ExecutableTimer(m_timer, this, "CRM_COUNTERS_POLL");
     Orch::addExecutor(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
     {