Unbreak libxo's handling of characters not representable in current locale
The xo_format_string_direct function loops forever never advancing the processed string pointer when it encounters a character that makes mbrtowc fail. Make it emit '?' character instead, as it seems this is what the code intent was, sans bugs. Differential Revision: https://reviews.freebsd.org/D2802 Reviewed by: marcel
This commit is contained in:
parent
619ba3b416
commit
dbf26257f1
@ -2077,7 +2077,8 @@ xo_format_string_direct (xo_handle_t *xop, xo_buffer_t *xbp,
|
||||
ilen = mbrtowc(&wc, cp, ilen, &xop->xo_mbstate);
|
||||
if (ilen < 0) { /* Invalid data; skip */
|
||||
xo_failure(xop, "invalid mbs char: %02hhx", *cp);
|
||||
continue;
|
||||
wc = L'?';
|
||||
ilen = 1;
|
||||
}
|
||||
if (ilen == 0) { /* Hit a wide NUL character */
|
||||
len = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user