From: Darrick J. Wong <djwong@xxxxxxxxxx>
For code that wants to examine a UChar string, use libicu's string
iterators to walk UChar strings, instead of the open-coded U16_NEXT*
macros that perform no typechecking.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
scrub/unicrash.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/scrub/unicrash.c b/scrub/unicrash.c
index dd30164354e..02a1b94efb4 100644
--- a/scrub/unicrash.c
+++ b/scrub/unicrash.c
@@ -330,13 +330,12 @@ name_entry_examine(
struct name_entry *entry,
unsigned int *badflags)
{
+ UCharIterator uiter;
UChar32 uchr;
- int32_t i;
uint8_t mask = 0;
- for (i = 0; i < entry->normstrlen;) {
- U16_NEXT_UNSAFE(entry->normstr, i, uchr);
-
+ uiter_setString(&uiter, entry->normstr, entry->normstrlen);
+ while ((uchr = uiter_next32(&uiter)) != U_SENTINEL) {
/* zero width character sequences */
switch (uchr) {
case 0x200B: /* zero width space */
