From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Fri, 31 Aug 2018 19:31:29 +0000 (+0200)
Subject: lib: vsprintf: correct printing of Unicode strings
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=31bd711cd03dde22484cf647b9abe498ae1b0c5f;p=u-boot.git

lib: vsprintf: correct printing of Unicode strings

The width and precision of the printf() function refer to the number of
characters not to the number of bytes printed.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 5abf734750..4213441fbf 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -280,18 +280,13 @@ static char *string16(char *buf, char *end, u16 *s, int field_width,
 		int precision, int flags)
 {
 	u16 *str = s ? s : L"<NULL>";
-	int utf16_len = u16_strnlen(str, precision);
-	u8 utf8[utf16_len * MAX_UTF8_PER_UTF16];
-	int utf8_len, i;
-
-	utf8_len = utf16_to_utf8(utf8, str, utf16_len) - utf8;
+	ssize_t len = utf16_strnlen(str, precision);
 
 	if (!(flags & LEFT))
-		while (utf8_len < field_width--)
+		for (; len < field_width; --field_width)
 			ADDCH(buf, ' ');
-	for (i = 0; i < utf8_len; ++i)
-		ADDCH(buf, utf8[i]);
-	while (utf8_len < field_width--)
+	utf16_utf8_strncpy(&buf, str, len);
+	for (; len < field_width; --field_width)
 		ADDCH(buf, ' ');
 	return buf;
 }