From 6ef8ff757abe72c70ef67ca43f7e25731c9a0451 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 21 Sep 2021 18:02:14 +0200 Subject: [PATCH] add check to prevent crash on null strings --- lib/uuid-common/src/read_flash_string.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/uuid-common/src/read_flash_string.cpp b/lib/uuid-common/src/read_flash_string.cpp index a5d6b78fe..94fccb6b1 100644 --- 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(flash_str)), '\0'); ::strncpy_P(&str[0], reinterpret_cast(flash_str), str.capacity() + 1);