ICU-23004 redo unsafe

2025-04-07 22:44:49 +00:00 · 2025-03-04 19:56:07 -08:00 · 2025-03-04 19:56:07 -08:00 · 26830a0c7b
commit 26830a0c7b
parent da7e930fb6
2 changed files with 626 additions and 169 deletions
--- a/icu4c/source/common/unicode/utf8.h
+++ b/icu4c/source/common/unicode/utf8.h
@ -683,7 +683,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
 */
 #define U8_PREV_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \
    (c)=(uint8_t)(s)[--(i)]; \
-    if(U8_IS_TRAIL(c)) { \
+    if(!U8_IS_SINGLE(c)) { \
        uint8_t __b, __count=1, __shift=6; \
 \
        /* c is a trail byte */ \
--- a/icu4c/source/common/unicode/utfiter.h
+++ b/icu4c/source/common/unicode/utfiter.h