add check to prevent crash on null strings

emsesp · Sep 21, 2021 · 6ef8ff7 · 6ef8ff7
1 parent 16e390f
commit 6ef8ff7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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);