Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib: vsprintf: avoid overflow printing UTF16 strings

Browse source 
We have to ensure while printing UTF16 strings that we do not exceed the
end of the print buffer.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2019-02-10 11:11:26 +01:00 committed by Alexander Graf
parent 5fbb28958b
commit 0e66c10a7d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/vsprintf.c
View file

@ -279,13 +279,17 @@ static char *string(char *buf, char *end, char *s, int field_width,
static char *string16(char *buf, char *end, u16 *s, int field_width, static char *string16(char *buf, char *end, u16 *s, int field_width,
int precision, int flags) int precision, int flags)
{ {
u16 *str = s ? s : L"<NULL>"; const u16 *str = s ? s : L"<NULL>";
ssize_t len = utf16_strnlen(str, precision); ssize_t i, len = utf16_strnlen(str, precision);
if (!(flags & LEFT)) if (!(flags & LEFT))
for (; len < field_width; --field_width) for (; len < field_width; --field_width)
ADDCH(buf, ' '); ADDCH(buf, ' ');
utf16_utf8_strncpy(&buf, str, len); for (i = 0; i < len && buf + utf16_utf8_strnlen(str, 1) <= end; ++i) {
s32 s = utf16_get(&str);
utf8_put(s, &buf);
}
for (; len < field_width; --field_width) for (; len < field_width; --field_width)
ADDCH(buf, ' '); ADDCH(buf, ' ');
return buf; return buf;