rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-21 09:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add null check for p_encrypted before MQTT publish (#9136)

Browse Source 
* Add null check for p_encrypted before MQTT publish

A user on BayMesh observed a strange crash in MQTT::onSend that seemed to be a null pointer dereference of this value.

* Trunk
This commit is contained in:
Jonathan Bennett
2026-01-01 13:53:36 -06:00
parent baccd0c532
commit 7d7091ef94
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mesh/Router.cpp
View File

@@ -745,15 +745,19 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
MeshModule::callModules(*p, src); MeshModule::callModules(*p, src);
#if !MESHTASTIC_EXCLUDE_MQTT #if !MESHTASTIC_EXCLUDE_MQTT
// Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not to if (p_encrypted == nullptr) {
// us (because we would be able to decrypt it) LOG_WARN("p_encrypted is null, skipping MQTT publish");
if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 && } else {
!isBroadcast(p->to) && !isToUs(p)) // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not
p_encrypted->pki_encrypted = true; // to us (because we would be able to decrypt it)
// After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled && !isBroadcast(p->to) && !isToUs(p))
!isFromUs(p) && mqtt) p_encrypted->pki_encrypted = true;
mqtt->onSend(*p_encrypted, *p, p->channel); // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
!isFromUs(p) && mqtt)
mqtt->onSend(*p_encrypted, *p, p->channel);
}
#endif #endif
} }