diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-02-10 13:11:26 +0300 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2019-02-13 11:40:06 +0300 |
| commit | 0e66c10a7d808062898f9a19f0c95f04d8dd85ed (patch) | |
| tree | 4c03de59966d96a733c85634721a567760e5b8a0 /lib | |
| parent | 5fbb28958becc2e725d2ee14a35c3b2f0918c62f (diff) | |
| download | u-boot-0e66c10a7d808062898f9a19f0c95f04d8dd85ed.tar.xz | |
lib: vsprintf: avoid overflow printing UTF16 strings
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 4213441fbf..de5db1aa5c 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -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, int precision, int flags) { - u16 *str = s ? s : L"<NULL>"; - ssize_t len = utf16_strnlen(str, precision); + const u16 *str = s ? s : L"<NULL>"; + ssize_t i, len = utf16_strnlen(str, precision); if (!(flags & LEFT)) for (; len < field_width; --field_width) 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) ADDCH(buf, ' '); return buf; |