d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak libxo's handling of characters not representable in current locale

Browse Source 
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:
Alexander Kabaev 2015-06-13 15:14:39 +00:00
parent 619ba3b416
commit dbf26257f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=284340
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/libxo/libxo/libxo.c
View File

@ -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;