Merge pull request #350 from sfc-aqua/fix-messages-delete

Add delete properly to avoid memory leak
sfc-aqua · Jan 17, 2022 · bb1c403 · bb1c403
2 parents 6e2a7e3 + dbee19a
commit bb1c403
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/quisp/modules/Application/Application.cc b/quisp/modules/Application/Application.cc
@@ -96,8 +96,8 @@ ConnectionSetupRequest *Application::createConnectionSetupRequest(int dest_addr,
  */
 void Application::handleMessage(cMessage *msg) {
   if (dynamic_cast<deleteThisModule *>(msg)) {
-    deleteModule();
     delete msg;
+    deleteModule();
     return;
   }
 

diff --git a/quisp/modules/QRSA/HardwareMonitor/HardwareMonitor.cc b/quisp/modules/QRSA/HardwareMonitor/HardwareMonitor.cc
@@ -1233,7 +1233,9 @@ cModule *HardwareMonitor::getQNodeWithAddress(int address) {
     addr = (int)node->getModule()->par("address");
     EV_DEBUG << "End node address is " << addr << "\n";
     if (addr == address) {
-      return node->getModule();
+      auto *mod = node->getModule();
+      delete topo;
+      return mod;
     }
   }
   delete topo;

diff --git a/quisp/modules/QRSA/RuleEngine/RuleEngine.cc b/quisp/modules/QRSA/RuleEngine/RuleEngine.cc
@@ -124,6 +124,7 @@ void RuleEngine::handleMessage(cMessage *msg) {
     if (terminated_qnic[qnic_address]) {
       // std::cout<<"NOT ANY MORE qnic["<<qnic_address<<"] in node["<<parentAddress<<"]";
       // error("qnic should not be terminated here, Node: %d, qnic_address: %d", parentAddress, qnic_address);
+      delete msg;
       return;
     } else if (pk->getInternal_qnic_index() == -1) {  // Schedule next burst. MIM, or the other node without internal HoM of MM
       EV_DEBUG << "This BSA request is non-internal\n";