pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-14 22:47:18 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix memory leak in NextHopRouter: always free packet copy when removing from pending

Browse Source
This commit is contained in:
Mike Robbins 2025-09-12 10:40:13 -07:00
parent 35340fc6e2
commit 0fc33c352a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesh/NextHopRouter.cpp
View File

@ -182,12 +182,18 @@ bool NextHopRouter::stopRetransmission(GlobalPacketId key)
if (isFromUs(p) || roleAllowsCancelingFromTxQueue(p)) { if (isFromUs(p) || roleAllowsCancelingFromTxQueue(p)) {
// remove the 'original' (identified by originator and packet->id) from the txqueue and free it // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
cancelSending(getFrom(p), p->id); cancelSending(getFrom(p), p->id);
// now free the pooled copy for retransmission too
packetPool.release(p);
} }
} }
// Regardless of whether or not we canceled this packet from the txQueue, remove it from our pending list so it doesn't
// get scheduled again. (This is the core of stopRetransmission.)
auto numErased = pending.erase(key); auto numErased = pending.erase(key);
assert(numErased == 1); assert(numErased == 1);
// When we remove an entry from pending, always be sure to release the copy of the packet that was allocated in the call
// to startRetransmission.
packetPool.release(p);
return true; return true;
} else } else
return false; return false;