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

error codes

Browse Source
This commit is contained in:
Frank
2025-11-20 00:34:33 +01:00
parent 6a4716e490
commit 0b1d22b8f1
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wled00/src/font/codepages.h
View File

@@ -2,6 +2,9 @@
#define WLED_CODEPAGES_H
#include <stdlib.h> // needed to get uint16_t definition
constexpr uint16_t UNKNOWN_CODE = 0x2022; // •
constexpr uint16_t BAD_CODE = 0x2022; // •
// UTF‑8 → reduced UTF‑16 decoding
// translates the next unicode UTF-8 item into a 2-byte "code point"
// return "•" in case of input errors, and for unsupported/invalid UTF-8

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

@@ -25,23 +25,23 @@ uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen) {
if (ch0 <= 0x7F) return ch0; // 1-byte ASCII (0x00-0x7F)
if ((ch0 & 0b11100000) == 0b11000000) { // 2-byte sequence (0xC2-0xDF)
// uses lower 5 bits of the first byte, and lower 6 bits from the next byte
if (length < 2 || !isValidContinuation(utf8[1])) return 0x2022; // • for malformed
if (length < 2 || !isValidContinuation(utf8[1])) return BAD_CODE; // malformed
codepoint = ((ch0 & 0b00011111) << 6) | (utf8[1] & 0b00111111);
if (codepoint < 0x80) return 0x2022; // Reject overlong encodings (must be >= 0x80)
if (codepoint < 0x80) return UNKNOWN_CODE; // Reject overlong encodings (must be >= 0x80)
return uint16_t(codepoint);
} else {
if ((ch0 & 0b11110000) == 0b11100000) { // 3-byte sequence (0xE0-0xEF)
// uses lower 4 bits of the first byte, and lower 6 bits from the next byte, lower 6 bits from third byte
if (length < 3 || !isValidContinuation(utf8[1]) || !isValidContinuation(utf8[2])) return 0x2022; // • for malformed
if (length < 3 || !isValidContinuation(utf8[1]) || !isValidContinuation(utf8[2])) return BAD_CODE; // malformed
codepoint = ((ch0 & 0b00001111) << 12) | ((utf8[1] & 0b00111111) << 6) | (utf8[2] & 0b00111111);
if (codepoint < 0x800) return 0x2022; // Reject overlong encodings (must be >= 0x800)
if (codepoint >= 0xD800 && codepoint <= 0xDFFF) return 0x2022; // Reject UTF-16 surrogate pairs (U+D800..U+DFFF)
if (codepoint >= 0x010000) codepoint = 0x2022; // result exceeds uint16_t => return • for "unknown"
if (codepoint < 0x800) return UNKNOWN_CODE; // Reject overlong encodings (must be >= 0x800)
if (codepoint >= 0xD800 && codepoint <= 0xDFFF) return UNKNOWN_CODE; // Reject UTF-16 surrogate pairs (U+D800..U+DFFF)
if (codepoint >= 0x010000) codepoint = UNKNOWN_CODE; // result exceeds uint16_t => "unknown"
return uint16_t(codepoint);
}
}
// 4-byte sequence or invalid lead byte - since we only support up to 0xFFFF, return error marker
return 0x2022; // • for unsupported/invalid
return BAD_CODE; // unsupported/invalid
}
// returns a pointer to the next unicode item - can be used to "advance" conversion after unicodeToWchar16()