From 7800dc3c8dba00aecb57bf6b2539930bb491bce2 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 25 Apr 2026 15:04:58 -0500
Subject: [PATCH] Enhance UTF-8 sanitization logic and add delays in test setup
 for reliable timing

---
 src/meshUtils.cpp                        | 4 ++--
 test/test_transmit_history/test_main.cpp | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/meshUtils.cpp b/src/meshUtils.cpp
index 89c548887..f2ee20589 100644
--- a/src/meshUtils.cpp
+++ b/src/meshUtils.cpp
@@ -124,10 +124,10 @@ bool sanitizeUtf8(char *buf, size_t bufSize)
     if (!buf || bufSize == 0)
         return false;
 
-    // Ensure null-terminated within buffer
+    // Ensure null-terminated within buffer; report if we had to enforce it
+    bool replaced = (buf[bufSize - 1] != '\0');
     buf[bufSize - 1] = '\0';
 
-    bool replaced = false;
     size_t i = 0;
     size_t len = strlen(buf);
 
diff --git a/test/test_transmit_history/test_main.cpp b/test/test_transmit_history/test_main.cpp
index 3bd84b55c..c242aa646 100644
--- a/test/test_transmit_history/test_main.cpp
+++ b/test/test_transmit_history/test_main.cpp
@@ -303,6 +303,10 @@ void setup()
 {
     initializeTestEnvironment();
 
+    // Wait for portduino's millis() clock to start ticking before tests run
+    testDelay(10);
+    testDelay(2000);
+
     UNITY_BEGIN();
 
     RUN_TEST(test_setLastSentToMesh_stores_millis);