From 92ee1820c42041dce922b8e5917eb46533f9e217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Tue, 8 Jul 2025 16:02:10 +0100
Subject: [PATCH] Add null check for packet allocation and clean up Dispatcher

---
 examples/simple_repeater/main.cpp | 13 ++++++++++---
 src/Dispatcher.cpp                |  9 ++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp
index 96969f96..428e932f 100644
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -774,9 +774,16 @@ public:
 #endif
 
         if (f16 == crc) {
-          mesh::Packet *pkt = _mgr->allocNew();
-          pkt->readFrom(bytes, len);
-          _mgr->queueInbound(pkt, millis());
+          Packet *pkt = _mgr->allocNew();
+
+          if (pkt != NULL) {
+            pkt->readFrom(bytes, len);
+            _mgr->queueInbound(pkt, millis());
+          } else {
+#if MESH_PACKET_LOGGING
+            Serial.printf("BRIDGE: Unable to allocate new Packet *pkt");
+#endif
+          }
         }
       }
     }
diff --git a/src/Dispatcher.cpp b/src/Dispatcher.cpp
index 1a6e833b..7f39dc49 100644
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -1,7 +1,7 @@
 #include "Dispatcher.h"
 
 #if MESH_PACKET_LOGGING
-#include <Arduino.h>
+  #include <Arduino.h>
 #endif
 
 #include <math.h>
@@ -104,7 +104,6 @@ void Dispatcher::loop() {
       processRecvPacket(pkt);
     }
   }
-
   checkRecv();
   checkSend();
 }
@@ -116,7 +115,6 @@ void Dispatcher::checkRecv() {
   {
     uint8_t raw[MAX_TRANS_UNIT+1];
     int len = _radio->recvRaw(raw, MAX_TRANS_UNIT);
-
     if (len > 0) {
       logRxRaw(_radio->getLastSNR(), _radio->getLastRSSI(), raw, len);
 
@@ -282,7 +280,7 @@ void Dispatcher::checkSend() {
       }
       outbound_expiry = futureMillis(max_airtime);
 
-#if MESH_PACKET_LOGGING
+    #if MESH_PACKET_LOGGING
       Serial.print(getLogDateTime());
       Serial.printf(": TX, len=%d (type=%d, route=%s, payload_len=%d)", 
             len, outbound->getPayloadType(), outbound->isRouteDirect() ? "D" : "F", outbound->payload_len);
@@ -292,7 +290,7 @@ void Dispatcher::checkSend() {
       } else {
         Serial.printf("\n");
       }
-#endif
+    #endif
     }
   }
 }
@@ -330,4 +328,5 @@ bool Dispatcher::millisHasNowPassed(unsigned long timestamp) const {
 unsigned long Dispatcher::futureMillis(int millis_from_now) const {
   return _ms->getMillis() + millis_from_now;
 }
+
 }
\ No newline at end of file