add check to prevent crash on null strings

2025-12-07 00:09:51 +03:00 · 2021-09-21 18:02:14 +02:00
parent 16e390f849
commit 6ef8ff757a
1 changed files with 4 additions and 0 deletions
--- a/lib/uuid-common/src/read_flash_string.cpp
+++ b/lib/uuid-common/src/read_flash_string.cpp
@@ -25,6 +25,10 @@
 namespace uuid {

 std::string read_flash_string(const __FlashStringHelper * flash_str) {
+    if (flash_str == nullptr) {
+        return std::string(""); // prevent crash
+    }
+
    std::string str(::strlen_P(reinterpret_cast<PGM_P>(flash_str)), '\0');

    ::strncpy_P(&str[0], reinterpret_cast<PGM_P>(flash_str), str.capacity() + 1);