Fix memory leak in MessageDispatcher when outGate->deliver returns false

pablomadoery · levy · commit ed87638e3b3f · 2026-02-23T14:54:47.000+01:00
diff --git a/src/inet/common/MessageDispatcher.cc b/src/inet/common/MessageDispatcher.cc
@@ -110,7 +110,11 @@ void MessageDispatcher::arrived(cMessage *message, cGate *inGate, const SendOpti
     }
     else
         outGate = handleMessage(check_and_cast<Message *>(message), inGate);
-    outGate->deliver(message, options, time);
+    bool keepMsg = outGate->deliver(message, options, time);
+    if (!keepMsg) {
+        take(message);
+        delete message;
+    }
 #ifdef INET_WITH_QUEUEING
 #endif // #ifdef INET_WITH_QUEUEING
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,11 @@ void MessageDispatcher::arrived(cMessage message, cGate inGate, const SendOpti`
`110`	`110`	`}`
`111`	`111`	`else`
`112`	`112`	`outGate = handleMessage(check_and_cast<Message *>(message), inGate);`
`113`		`- outGate->deliver(message, options, time);`
	`113`	`+ bool keepMsg = outGate->deliver(message, options, time);`
	`114`	`+ if (!keepMsg) {`
	`115`	`+ take(message);`
	`116`	`+ delete message;`
	`117`	`+ }`
`114`	`118`	`#ifdef INET_WITH_QUEUEING`
`115`	`119`	`#endif // #ifdef INET_WITH_QUEUEING`
`116`	`120`	`}`