pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-20 00:31:09 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix memory leaks by adding missing free() calls before early returns in MQTT::onReceive (#5439)

Browse Source 
This fix addresses memory leaks in the `MQTT::onReceive` function by ensuring that dynamically allocated resources (`e.channel_id`, `e.gateway_id` and `e.packet`) are properly freed before each early return. Previously, these resources were only freed at the end of the function, leaving them unhandled in certain exit paths. Adding the missing `free()` calls prevents memory leaks and ensures proper resource cleanup in all scenarios.
This commit is contained in:
César de Tassis Filho 2024-11-25 01:05:06 -03:00 committed by Tom Fifield
parent 66e219dd39
commit fe1ed0dd08
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mqtt/MQTT.cpp
View File

@ -167,17 +167,26 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
if (isFromUs(p)) { if (isFromUs(p)) {
LOG_INFO("Ignore downlink message we originally sent"); LOG_INFO("Ignore downlink message we originally sent");
packetPool.release(p); packetPool.release(p);
free(e.channel_id);
free(e.gateway_id);
free(e.packet);
return; return;
} }
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) { if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
if (moduleConfig.mqtt.encryption_enabled) { if (moduleConfig.mqtt.encryption_enabled) {
LOG_INFO("Ignore decoded message on MQTT, encryption is enabled"); LOG_INFO("Ignore decoded message on MQTT, encryption is enabled");
packetPool.release(p); packetPool.release(p);
free(e.channel_id);
free(e.gateway_id);
free(e.packet);
return; return;
} }
if (p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) { if (p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) {
LOG_INFO("Ignore decoded admin packet"); LOG_INFO("Ignore decoded admin packet");
packetPool.release(p); packetPool.release(p);
free(e.channel_id);
free(e.gateway_id);
free(e.packet);
return; return;
} }
p->channel = ch.index; p->channel = ch.index;
@ -771,4 +780,4 @@ bool MQTT::isPrivateIpAddress(const char address[])
int octet2Num = atoi(octet2); int octet2Num = atoi(octet2);
return octet2Num >= 16 && octet2Num <= 31; return octet2Num >= 16 && octet2Num <= 31;
} }