Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

strlen => strnlen

Browse Source
This commit is contained in:
Frank
2025-11-20 00:41:21 +01:00
parent 0b1d22b8f1
commit e4f4294233
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wled00/src/font/unicodetool.cpp
View File

@@ -15,7 +15,7 @@ static inline bool isValidContinuation(unsigned char byte) {
uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen) { uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen) {
if (!utf8 || (maxLen < 1) || *utf8 == '\0') return 0; // sanity check if (!utf8 || (maxLen < 1) || *utf8 == '\0') return 0; // sanity check
size_t length = strlen((const char*) utf8); size_t length = strnlen((const char*) utf8, maxLen);
length = min(length, maxLen); length = min(length, maxLen);
if (length < 1) return 0; // sanity check if (length < 1) return 0; // sanity check
@@ -48,7 +48,7 @@ uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen) {
// return nullptr at end of input // return nullptr at end of input
const unsigned char* nextUnicode(const unsigned char* utf8, size_t maxLen) { const unsigned char* nextUnicode(const unsigned char* utf8, size_t maxLen) {
if ((!utf8) || (maxLen < 1) || (*utf8 == 0)) return nullptr; // sanity check if ((!utf8) || (maxLen < 1) || (*utf8 == 0)) return nullptr; // sanity check
size_t length = strlen((const char*) utf8); // safe, because utf8 is a C string with proper NUL termination size_t length = strnlen((const char*) utf8, maxLen);
length = min(length, maxLen); length = min(length, maxLen);
if (length < 1) return nullptr; // we are at end of input if (length < 1) return nullptr; // we are at end of input